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 / fsl-viu.c

diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index dbf0ce38a8e7db1566d5ddde361f51d570fca03d..d5dc198502ef0a81fc804594733e06ac8f60933f 100644 (file)
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -964,7 +964,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id)
        struct viu_fh *fh = priv;
 
        fh->dev->std = id;
-       decoder_call(fh->dev, core, s_std, id);
+       decoder_call(fh->dev, video, s_std, id);
        return 0;
 }