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

[linux-block.git] / drivers / staging / media / imx / imx-media-csc-scaler.c

diff --git a/drivers/staging/media/imx/imx-media-csc-scaler.c b/drivers/staging/media/imx/imx-media-csc-scaler.c
index 2b635ebf62d6a88f22d4a0aeffae79cb60484780..2cc77f6e84b65b69c6b1a7fad53eea1e53ed42ea 100644 (file)
--- a/drivers/staging/media/imx/imx-media-csc-scaler.c
+++ b/drivers/staging/media/imx/imx-media-csc-scaler.c
@@ -849,7 +849,7 @@ int imx_media_csc_scaler_device_register(struct imx_media_video_dev *vdev)
 
        vfd->v4l2_dev = &priv->md->v4l2_dev;
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
        if (ret) {
                v4l2_err(vfd->v4l2_dev, "Failed to register video device\n");
                return ret;