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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (255 commits)
  [media] radio-aimslab.c: Fix gcc 4.5+ bug
  [media] cx25821: Fix compilation breakage due to BKL dependency
  [media] v4l2-compat-ioctl32: fix compile warning
  [media] zoran: fix compiler warning
  [media] tda18218: fix compile warning
  [media] ngene: fix compile warning
  [media] DVB: IR support for TechnoTrend CT-3650
  [media] cx23885, cimax2.c: Fix case of two CAM insertion irq
  [media] ir-nec-decoder: fix repeat key issue
  [media] staging: se401 depends on USB
  [media] staging: usbvideo/vicam depends on USB
  [media] soc_camera: Add the ability to bind regulators to soc_camedra devices
  [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor
  [media] v4l: soc-camera: switch to .unlocked_ioctl
  [media] v4l: ov772x: simplify pointer dereference
  [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
  [media] ov9640: use macro to request OmniVision OV9640 sensor private data
  [media] ivtv-i2c: Fix two warnings
  [media] staging/lirc: Update lirc TODO files
  [media] cx88: Remove the obsolete i2c_adapter.id field
  ...

1 files changed, 20 insertions, 8 deletions

diff --git a/drivers/media/video/gspca/sq930x.c b/drivers/media/video/gspca/sq930x.c
index 3e4b0b94c700..a4a98811b9e3 100644
--- a/drivers/media/video/gspca/sq930x.c
+++ b/drivers/media/video/gspca/sq930x.c
@@ -687,10 +687,19 @@ static void cmos_probe(struct gspca_dev *gspca_dev)
                 if (gspca_dev->usb_buf[0] != 0)
                         break;
         }
-        if (i >= ARRAY_SIZE(probe_order))
+        if (i >= ARRAY_SIZE(probe_order)) {
                 err("Unknown sensor");
-        else
-                sd->sensor = probe_order[i];
+                gspca_dev->usb_err = -EINVAL;
+                return;
+        }
+        sd->sensor = probe_order[i];
+        switch (sd->sensor) {
+        case SENSOR_OV7660:
+        case SENSOR_OV9630:
+                err("Sensor %s not yet treated", sensor_tb[sd->sensor].name);
+                gspca_dev->usb_err = -EINVAL;
+                break;
+        }
 }
 
 static void mt9v111_init(struct gspca_dev *gspca_dev)
@@ -867,6 +876,9 @@ static int sd_init(struct gspca_dev *gspca_dev)
  */
 
         reg_r(gspca_dev, SQ930_CTRL_GET_DEV_INFO, 8);
+        if (gspca_dev->usb_err < 0)
+                return gspca_dev->usb_err;
+
 /* it returns:
  * 03 00 12 93 0b f6 c9 00      live! ultra
  * 03 00 07 93 0b f6 ca 00      live! ultra for notebook
@@ -900,15 +912,15 @@ static int sd_init(struct gspca_dev *gspca_dev)
         if (sd->sensor == SENSOR_MI0360) {
 
                 /* no sensor probe for icam tracer */
-                if (gspca_dev->usb_buf[5] == 0xf6)      /* if CMOS */
+                if (gspca_dev->usb_buf[5] == 0xf6)      /* if ccd */
                         sd->sensor = SENSOR_ICX098BQ;
                 else
                         cmos_probe(gspca_dev);
         }
-
-        PDEBUG(D_PROBE, "Sensor %s", sensor_tb[sd->sensor].name);
-
-        global_init(sd, 1);
+        if (gspca_dev->usb_err >= 0) {
+                PDEBUG(D_PROBE, "Sensor %s", sensor_tb[sd->sensor].name);
+                global_init(sd, 1);
+        }
         return gspca_dev->usb_err;
 }