Merge branch 'topic/workq-update' into topic/misc

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c
index 02a21bccae18..9eda7cc03121 100644
--- a/drivers/media/video/via-camera.c
+++ b/drivers/media/video/via-camera.c
@@ -1360,7 +1360,7 @@ static __devinit int viacam_probe(struct platform_device *pdev)
          */
         sensor_adapter = viafb_find_i2c_adapter(VIA_PORT_31);
         cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, sensor_adapter,
-                        "ov7670", "ov7670", 0x42 >> 1, NULL);
+                        "ov7670", 0x42 >> 1, NULL);
         if (cam->sensor == NULL) {
                 dev_err(&pdev->dev, "Unable to find the sensor!\n");
                 ret = -ENODEV;