1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c
index b6a94a1ad19b..4ec3df58e247 100644
--- a/drivers/media/video/ivtv/ivtv-irq.c
+++ b/drivers/media/video/ivtv/ivtv-irq.c
@@ -750,8 +750,8 @@ static void ivtv_irq_vsync(struct ivtv *itv)
         if (0) IVTV_DEBUG_IRQ("DEC VSYNC\n");
 
         if (((frame ^ itv->yuv_info.sync_field[last_dma_frame]) == 0 &&
-                ((itv->lastVsyncFrame & 1) ^ itv->yuv_info.sync_field[last_dma_frame])) ||
-                        (frame != (itv->lastVsyncFrame & 1) && !itv->yuv_info.frame_interlaced)) {
+                ((itv->last_vsync_frame & 1) ^ itv->yuv_info.sync_field[last_dma_frame])) ||
+                        (frame != (itv->last_vsync_frame & 1) && !itv->yuv_info.frame_interlaced)) {
                 int next_dma_frame = last_dma_frame;
 
                 if (!(itv->yuv_info.frame_interlaced && itv->yuv_info.field_delay[next_dma_frame] && itv->yuv_info.fields_lapsed < 1)) {
@@ -766,10 +766,10 @@ static void ivtv_irq_vsync(struct ivtv *itv)
                         }
                 }
         }
-        if (frame != (itv->lastVsyncFrame & 1)) {
+        if (frame != (itv->last_vsync_frame & 1)) {
                 struct ivtv_stream *s = ivtv_get_output_stream(itv);
 
-                itv->lastVsyncFrame += 1;
+                itv->last_vsync_frame += 1;
                 if (frame == 0) {
                         clear_bit(IVTV_F_I_VALID_DEC_TIMINGS, &itv->i_flags);
                         clear_bit(IVTV_F_I_EV_VSYNC_FIELD, &itv->i_flags);
@@ -834,7 +834,7 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id)
                  */
                 if (~itv->irqmask & IVTV_IRQ_DEC_VSYNC) {
                         /* vsync is enabled, see if we're in a new field */
-                        if ((itv->lastVsyncFrame & 1) != (read_reg(0x28c0) & 1)) {
+                        if ((itv->last_vsync_frame & 1) != (read_reg(0x28c0) & 1)) {
                                 /* New field, looks like we missed it */
                                 IVTV_DEBUG_YUV("VSync interrupt missed %d\n",read_reg(0x28c0)>>16);
                                 vsync_force = 1;
@@ -888,7 +888,7 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id)
         if (combo & IVTV_IRQ_ENC_EOS) {
                 IVTV_DEBUG_IRQ("ENC EOS\n");
                 set_bit(IVTV_F_I_EOS, &itv->i_flags);
-                wake_up(&itv->cap_w);
+                wake_up(&itv->eos_waitq);
         }
 
         if (combo & IVTV_IRQ_DEC_DATA_REQ) {