I forgot to change USB_DEVICE_ID_MATCH_VENDOR to USB_DEVICE_ID_MATCH_DEVICE in
the last commit, defeating its whole purpose. Fix this.

Signed-off-by: Laurent Pinchart <[email protected]>

Mauro, can you merge this with the "Don't apply the FIX_BANDWIDTH quirk to all
ViMicro devices" commit (changeset 12328:da81aafb9c5d) and keep the commit
message of the first when you push them upstream ? As this is a 2.6.30
regression it would be nice to get the fix in 2.6.31.

diff -r f8f134705b65 -r 2b37d4d66c1a 
linux/drivers/media/video/uvc/uvc_driver.c
--- a/linux/drivers/media/video/uvc/uvc_driver.c        Fri Jul 24 16:19:39 
2009 
-0300
+++ b/linux/drivers/media/video/uvc/uvc_driver.c        Sun Jul 26 18:30:02 
2009 
+0200
@@ -1852,7 +1852,7 @@
          .bInterfaceProtocol   = 0,
          .driver_info          = UVC_QUIRK_STREAM_NO_FID },
        /* ViMicro Vega */
-       { .match_flags          = USB_DEVICE_ID_MATCH_VENDOR
+       { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                | USB_DEVICE_ID_MATCH_INT_INFO,
          .idVendor             = 0x0ac8,
          .idProduct            = 0x332d,
@@ -1861,7 +1861,7 @@
          .bInterfaceProtocol   = 0,
          .driver_info          = UVC_QUIRK_FIX_BANDWIDTH },
        /* ViMicro - Minoru3D */
-       { .match_flags          = USB_DEVICE_ID_MATCH_VENDOR
+       { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                | USB_DEVICE_ID_MATCH_INT_INFO,
          .idVendor             = 0x0ac8,
          .idProduct            = 0x3410,
@@ -1870,7 +1870,7 @@
          .bInterfaceProtocol   = 0,
          .driver_info          = UVC_QUIRK_FIX_BANDWIDTH },
        /* ViMicro Venus - Minoru3D */
-       { .match_flags          = USB_DEVICE_ID_MATCH_VENDOR
+       { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                | USB_DEVICE_ID_MATCH_INT_INFO,
          .idVendor             = 0x0ac8,
          .idProduct            = 0x3420,


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to