4 files changed, 18 insertions, 14 deletions

diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index 0800433b2092..18305c89083c 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -2858,7 +2858,6 @@ static void ov7xx0_configure(struct sd *sd)
                         case 0x60:
                                 PDEBUG(D_PROBE, "Sensor is a OV7660");
                                 sd->sensor = SEN_OV7660;
-                                sd->invert_led = 0;
                                 break;
                         default:
                                 PDEBUG(D_PROBE, "Unknown sensor: 0x76%x", low);
@@ -3337,7 +3336,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         case BRIDGE_OV519:
                 cam->cam_mode = ov519_vga_mode;
                 cam->nmodes = ARRAY_SIZE(ov519_vga_mode);
-                sd->invert_led = !sd->invert_led;
                 break;
         case BRIDGE_OVFX2:
                 cam->cam_mode = ov519_vga_mode;
@@ -5005,24 +5003,24 @@ static const struct sd_desc sd_desc = {
 /* -- module initialisation -- */
 static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x4003), .driver_info = BRIDGE_W9968CF },
-        {USB_DEVICE(0x041e, 0x4052), .driver_info = BRIDGE_OV519 },
-        {USB_DEVICE(0x041e, 0x405f),
+        {USB_DEVICE(0x041e, 0x4052),
                 .driver_info = BRIDGE_OV519 | BRIDGE_INVERT_LED },
+        {USB_DEVICE(0x041e, 0x405f), .driver_info = BRIDGE_OV519 },
         {USB_DEVICE(0x041e, 0x4060), .driver_info = BRIDGE_OV519 },
         {USB_DEVICE(0x041e, 0x4061), .driver_info = BRIDGE_OV519 },
-        {USB_DEVICE(0x041e, 0x4064),
-                .driver_info = BRIDGE_OV519 | BRIDGE_INVERT_LED },
+        {USB_DEVICE(0x041e, 0x4064), .driver_info = BRIDGE_OV519 },
         {USB_DEVICE(0x041e, 0x4067), .driver_info = BRIDGE_OV519 },
-        {USB_DEVICE(0x041e, 0x4068),
+        {USB_DEVICE(0x041e, 0x4068), .driver_info = BRIDGE_OV519 },
+        {USB_DEVICE(0x045e, 0x028c),
                 .driver_info = BRIDGE_OV519 | BRIDGE_INVERT_LED },
-        {USB_DEVICE(0x045e, 0x028c), .driver_info = BRIDGE_OV519 },
         {USB_DEVICE(0x054c, 0x0154), .driver_info = BRIDGE_OV519 },
-        {USB_DEVICE(0x054c, 0x0155),
-                .driver_info = BRIDGE_OV519 | BRIDGE_INVERT_LED },
+        {USB_DEVICE(0x054c, 0x0155), .driver_info = BRIDGE_OV519 },
         {USB_DEVICE(0x05a9, 0x0511), .driver_info = BRIDGE_OV511 },
         {USB_DEVICE(0x05a9, 0x0518), .driver_info = BRIDGE_OV518 },
-        {USB_DEVICE(0x05a9, 0x0519), .driver_info = BRIDGE_OV519 },
-        {USB_DEVICE(0x05a9, 0x0530), .driver_info = BRIDGE_OV519 },
+        {USB_DEVICE(0x05a9, 0x0519),
+                .driver_info = BRIDGE_OV519 | BRIDGE_INVERT_LED },
+        {USB_DEVICE(0x05a9, 0x0530),
+                .driver_info = BRIDGE_OV519 | BRIDGE_INVERT_LED },
         {USB_DEVICE(0x05a9, 0x2800), .driver_info = BRIDGE_OVFX2 },
         {USB_DEVICE(0x05a9, 0x4519), .driver_info = BRIDGE_OV519 },
         {USB_DEVICE(0x05a9, 0x8519), .driver_info = BRIDGE_OV519 },
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 81b8a600783b..c477ad11f103 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -2386,7 +2386,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 reg_w1(gspca_dev, 0x01, 0x22);
                 msleep(100);
                 reg01 = SCL_SEL_OD | S_PDN_INV;
-                reg17 &= MCK_SIZE_MASK;
+                reg17 &= ~MCK_SIZE_MASK;
                 reg17 |= 0x04;          /* clock / 4 */
                 break;
         }
@@ -2532,6 +2532,10 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 if (!mode) {                    /* if 640x480 */
                         reg17 &= ~MCK_SIZE_MASK;
                         reg17 |= 0x04;          /* clock / 4 */
+                } else {
+                        reg01 &= ~SYS_SEL_48M;  /* clk 24Mz */
+                        reg17 &= ~MCK_SIZE_MASK;
+                        reg17 |= 0x02;          /* clock / 2 */
                 }
                 break;
         case SENSOR_OV7630:
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index e9a0e94b9995..8c70e64444e7 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -338,7 +338,7 @@ int pwc_init_controls(struct pwc_device *pdev)
         if (pdev->restore_factory)
                 pdev->restore_factory->flags = V4L2_CTRL_FLAG_UPDATE;
 
-        if (!pdev->features & FEATURE_MOTOR_PANTILT)
+        if (!(pdev->features & FEATURE_MOTOR_PANTILT))
                 return hdl->error;
 
         /* Motor pan / tilt / reset */
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c
index 85d3048c1d67..bb7f17f2a33c 100644
--- a/drivers/media/video/via-camera.c
+++ b/drivers/media/video/via-camera.c
@@ -1332,6 +1332,8 @@ static __devinit bool viacam_serial_is_enabled(void)
         struct pci_bus *pbus = pci_find_bus(0, 0);
         u8 cbyte;
 
+        if (!pbus)
+                return false;
         pci_bus_read_config_byte(pbus, VIACAM_SERIAL_DEVFN,
                         VIACAM_SERIAL_CREG, &cbyte);
         if ((cbyte & VIACAM_SERIAL_BIT) == 0)