Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (243 commits)
  V4L/DVB: sms: Convert IR support to use the Remote Controller core
  V4L/DVB: sms: properly initialize IR phys and IR name
  V4L/DVB: standardize names at rc-dib0700 tables
  V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick
  V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5
  V4L/DVB: dib0700: properly implement IR change_protocol
  V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
  V4L/DVB: dib0700: avoid bad repeat
  V4L/DVB: Port dib0700 to rc-core
  V4L/DVB: Add a keymap file with dib0700 table
  V4L/DVB: dvb-usb: add support for rc-core mode
  V4L/DVB: dvb-usb: prepare drivers for using rc-core
  V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key
  V4L/DVB: rj54n1cb0c: fix a comment in the driver
  V4L/DVB: V4L2: sh_vou: VOU does support the full PAL resolution too
  V4L/DVB: V4L2: sh_mobile_camera_ceu: add support for CSI2
  V4L/DVB: V4L2: soc-camera: add a MIPI CSI-2 driver for SH-Mobile platforms
  V4L/DVB: V4L2: soc-camera: export soc-camera bus type for notifications
  V4L/DVB: V4L2: mediabus: add 12-bit Bayer and YUV420 pixel formats
  V4L/DVB: mediabus: fix ambiguous pixel code names
  ...

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/gadget/f_uvc.c b/drivers/usb/gadget/f_uvc.c
index dbe6db0184fd..be446b7e7eaa 100644
--- a/drivers/usb/gadget/f_uvc.c
+++ b/drivers/usb/gadget/f_uvc.c
@@ -61,12 +61,12 @@ static struct usb_gadget_strings *uvc_function_strings[] = {
 #define UVC_INTF_VIDEO_STREAMING                1
 
 static struct usb_interface_assoc_descriptor uvc_iad __initdata = {
-        .bLength                = USB_DT_INTERFACE_ASSOCIATION_SIZE,
+        .bLength                = sizeof(uvc_iad),
         .bDescriptorType        = USB_DT_INTERFACE_ASSOCIATION,
         .bFirstInterface        = 0,
         .bInterfaceCount        = 2,
         .bFunctionClass         = USB_CLASS_VIDEO,
-        .bFunctionSubClass      = 0x03,
+        .bFunctionSubClass      = UVC_SC_VIDEO_INTERFACE_COLLECTION,
         .bFunctionProtocol      = 0x00,
         .iFunction              = 0,
 };
@@ -78,7 +78,7 @@ static struct usb_interface_descriptor uvc_control_intf __initdata = {
         .bAlternateSetting      = 0,
         .bNumEndpoints          = 1,
         .bInterfaceClass        = USB_CLASS_VIDEO,
-        .bInterfaceSubClass     = 0x01,
+        .bInterfaceSubClass     = UVC_SC_VIDEOCONTROL,
         .bInterfaceProtocol     = 0x00,
         .iInterface             = 0,
 };
@@ -106,7 +106,7 @@ static struct usb_interface_descriptor uvc_streaming_intf_alt0 __initdata = {
         .bAlternateSetting      = 0,
         .bNumEndpoints          = 0,
         .bInterfaceClass        = USB_CLASS_VIDEO,
-        .bInterfaceSubClass     = 0x02,
+        .bInterfaceSubClass     = UVC_SC_VIDEOSTREAMING,
         .bInterfaceProtocol     = 0x00,
         .iInterface             = 0,
 };
@@ -118,7 +118,7 @@ static struct usb_interface_descriptor uvc_streaming_intf_alt1 __initdata = {
         .bAlternateSetting      = 1,
         .bNumEndpoints          = 1,
         .bInterfaceClass        = USB_CLASS_VIDEO,
-        .bInterfaceSubClass     = 0x02,
+        .bInterfaceSubClass     = UVC_SC_VIDEOSTREAMING,
         .bInterfaceProtocol     = 0x00,
         .iInterface             = 0,
 };
@@ -603,15 +603,15 @@ uvc_bind_config(struct usb_configuration *c,
 
         /* Validate the descriptors. */
         if (control == NULL || control[0] == NULL ||
-            control[0]->bDescriptorSubType != UVC_DT_HEADER)
+            control[0]->bDescriptorSubType != UVC_VC_HEADER)
                 goto error;
 
         if (fs_streaming == NULL || fs_streaming[0] == NULL ||
-            fs_streaming[0]->bDescriptorSubType != UVC_DT_INPUT_HEADER)
+            fs_streaming[0]->bDescriptorSubType != UVC_VS_INPUT_HEADER)
                 goto error;
 
         if (hs_streaming == NULL || hs_streaming[0] == NULL ||
-            hs_streaming[0]->bDescriptorSubType != UVC_DT_INPUT_HEADER)
+            hs_streaming[0]->bDescriptorSubType != UVC_VS_INPUT_HEADER)
                 goto error;
 
         uvc->desc.control = control;