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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (425 commits)
  V4L/DVB (11870): gspca - main: VIDIOC_ENUM_FRAMESIZES ioctl added.
  V4L/DVB (12004): poll method lose race condition
  V4L/DVB (11894): flexcop-pci: dmesg visible names broken
  V4L/DVB (11892): Siano: smsendian - declare function as extern
  V4L/DVB (11891): Siano: smscore - bind the GPIO SMS protocol
  V4L/DVB (11890): Siano: smscore - remove redundant code
  V4L/DVB (11889): Siano: smsdvb - add DVB v3 events
  V4L/DVB (11888): Siano: smsusb - remove redundant ifdef
  V4L/DVB (11887): Siano: smscards - add board (target) events
  V4L/DVB (11886): Siano: smscore - fix some new GPIO definitions names
  V4L/DVB (11885): Siano: Add new GPIO management interface
  V4L/DVB (11884): Siano: smssdio - revert to stand alone module
  V4L/DVB (11883): Siano: cards - add two additional (USB) devices
  V4L/DVB (11824): Siano: smsusb - change exit func debug msg
  V4L/DVB (11823): Siano: smsusb - fix typo in module description
  V4L/DVB (11822): Siano: smscore - bug fix at get_device_mode
  V4L/DVB (11821): Siano: smscore - fix isdb-t firmware name
  V4L/DVB (11820): Siano: smscore - fix byte ordering bug
  V4L/DVB (11819): Siano: smscore - fix get_common_buffer bug
  V4L/DVB (11818): Siano: smscards - assign gpio to HPG targets
  ...

1 files changed, 15 insertions, 20 deletions

diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index 0d7e38d6ff6a..36a6ba92df27 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -1372,21 +1372,19 @@ end:
 }
 
 /*
- * Prune an entity of its bogus controls. This currently includes processing
- * unit auto controls for which no corresponding manual control is available.
- * Such auto controls make little sense if any, and are known to crash at
- * least the SiGma Micro webcam.
+ * Prune an entity of its bogus controls using a blacklist. Bogus controls
+ * are currently the ones that crash the camera or unconditionally return an
+ * error when queried.
  */
 static void
-uvc_ctrl_prune_entity(struct uvc_entity *entity)
+uvc_ctrl_prune_entity(struct uvc_device *dev, struct uvc_entity *entity)
 {
         static const struct {
-                u8 idx_manual;
-                u8 idx_auto;
+                struct usb_device_id id;
+                u8 index;
         } blacklist[] = {
-                { 2, 11 }, /* Hue */
-                { 6, 12 }, /* White Balance Temperature */
-                { 7, 13 }, /* White Balance Component */
+                { { USB_DEVICE(0x1c4f, 0x3000) }, 6 }, /* WB Temperature */
+                { { USB_DEVICE(0x5986, 0x0241) }, 2 }, /* Hue */
         };
 
         u8 *controls;
@@ -1400,19 +1398,17 @@ uvc_ctrl_prune_entity(struct uvc_entity *entity)
         size = entity->processing.bControlSize;
 
         for (i = 0; i < ARRAY_SIZE(blacklist); ++i) {
-                if (blacklist[i].idx_auto >= 8 * size ||
-                    blacklist[i].idx_manual >= 8 * size)
+                if (!usb_match_id(dev->intf, &blacklist[i].id))
                         continue;
 
-                if (!uvc_test_bit(controls, blacklist[i].idx_auto) ||
-                     uvc_test_bit(controls, blacklist[i].idx_manual))
+                if (blacklist[i].index >= 8 * size ||
+                    !uvc_test_bit(controls, blacklist[i].index))
                         continue;
 
-                uvc_trace(UVC_TRACE_CONTROL, "Auto control %u/%u has no "
-                        "matching manual control, removing it.\n", entity->id,
-                        blacklist[i].idx_auto);
+                uvc_trace(UVC_TRACE_CONTROL, "%u/%u control is black listed, "
+                        "removing it.\n", entity->id, blacklist[i].index);
 
-                uvc_clear_bit(controls, blacklist[i].idx_auto);
+                uvc_clear_bit(controls, blacklist[i].index);
         }
 }
 
@@ -1442,8 +1438,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
                         bControlSize = entity->camera.bControlSize;
                 }
 
-                if (dev->quirks & UVC_QUIRK_PRUNE_CONTROLS)
-                        uvc_ctrl_prune_entity(entity);
+                uvc_ctrl_prune_entity(dev, entity);
 
                 for (i = 0; i < bControlSize; ++i)
                         ncontrols += hweight8(bmControls[i]);