Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / vino.c

diff --git a/drivers/media/platform/vino.c b/drivers/media/platform/vino.c
index c6af974c5b45c82eced9d54ee8d2337b2d276800..470d35336119743ab9c46138f6c1156d14af7178 100644 (file)
--- a/drivers/media/platform/vino.c
+++ b/drivers/media/platform/vino.c
@@ -2586,7 +2586,7 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
                        }
                        if (data_norm == 3)
                                data_norm = VINO_DATA_NORM_PAL;
-                       ret = decoder_call(core, s_std, norm);
+                       ret = decoder_call(video, s_std, norm);
                }
 
                spin_lock_irqsave(&vino_drvdata->input_lock, flags);
@@ -2675,7 +2675,7 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
                                }
                                if (data_norm == 3)
                                        data_norm = VINO_DATA_NORM_PAL;
-                               ret = decoder_call(core, s_std, norm);
+                               ret = decoder_call(video, s_std, norm);
                        }
 
                        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
@@ -2809,7 +2809,7 @@ static int vino_set_data_norm(struct vino_channel_settings *vcs,
                 * as it may take a while... */
 
                norm = vino_data_norms[data_norm].std;
-               err = decoder_call(core, s_std, norm);
+               err = decoder_call(video, s_std, norm);
 
                spin_lock_irqsave(&vino_drvdata->input_lock, *flags);