Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

[platform/kernel/linux-starfive.git] / drivers / media / video / zr364xx.c

diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 9aae011..f0eae83 100644 (file)
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -115,6 +115,7 @@ static struct usb_device_id device_table[] = {
        {USB_DEVICE(0x0a17, 0x004e), .driver_info = METHOD2 },
        {USB_DEVICE(0x041e, 0x405d), .driver_info = METHOD2 },
        {USB_DEVICE(0x08ca, 0x2102), .driver_info = METHOD2 },
+       {USB_DEVICE(0x06d6, 0x003d), .driver_info = METHOD0 },
        {}                      /* Terminating entry */
 };
 
@@ -1454,7 +1455,6 @@ static struct video_device zr364xx_template = {
        .fops = &zr364xx_fops,
        .ioctl_ops = &zr364xx_ioctl_ops,
        .release = video_device_release,
-       .minor = -1,
 };
 
 
@@ -1634,8 +1634,8 @@ static int zr364xx_probe(struct usb_interface *intf,
 
        spin_lock_init(&cam->slock);
 
-       dev_info(&udev->dev, DRIVER_DESC " controlling video device %d\n",
-                cam->vdev->num);
+       dev_info(&udev->dev, DRIVER_DESC " controlling device %s\n",
+                video_device_node_name(cam->vdev));
        return 0;
 }