aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/gspca/m5602/m5602_core.c4
-rw-r--r--drivers/media/video/gspca/m5602/m5602_mt9m111.c6
-rw-r--r--drivers/media/video/gspca/m5602/m5602_s5k83a.c3
3 files changed, 9 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index dd1024325fc7..8a5bba16ff32 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -113,7 +113,9 @@ int m5602_read_sensor(struct sd *sd, const u8 address,
113 if (err < 0) 113 if (err < 0)
114 return err; 114 return err;
115 115
116 /* Sensors with registers that only are one byte width are differently read */ 116 /* Sensors with registers that are of only
117 one byte width are differently read */
118
117 /* FIXME: This works with the ov9650, but has issues with the po1030 */ 119 /* FIXME: This works with the ov9650, but has issues with the po1030 */
118 if (sd->sensor->i2c_regW == 1) { 120 if (sd->sensor->i2c_regW == 1) {
119 err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 1); 121 err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 1);
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
index 0c9470e137e3..8d071dff6944 100644
--- a/drivers/media/video/gspca/m5602/m5602_mt9m111.c
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
@@ -338,7 +338,8 @@ int mt9m111_start(struct sd *sd)
338 (sensor_settings[VFLIP_IDX] << 0) | 338 (sensor_settings[VFLIP_IDX] << 0) |
339 (sensor_settings[HFLIP_IDX] << 1); 339 (sensor_settings[HFLIP_IDX] << 1);
340 340
341 err = m5602_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2); 341 err = m5602_write_sensor(sd,
342 MT9M111_SC_R_MODE_CONTEXT_B, data, 2);
342 break; 343 break;
343 344
344 case 320: 345 case 320:
@@ -348,7 +349,8 @@ int mt9m111_start(struct sd *sd)
348 MT9M111_RMB_COLUMN_SKIP_4X | 349 MT9M111_RMB_COLUMN_SKIP_4X |
349 (sensor_settings[VFLIP_IDX] << 0) | 350 (sensor_settings[VFLIP_IDX] << 0) |
350 (sensor_settings[HFLIP_IDX] << 1); 351 (sensor_settings[HFLIP_IDX] << 1);
351 err = m5602_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2); 352 err = m5602_write_sensor(sd,
353 MT9M111_SC_R_MODE_CONTEXT_B, data, 2);
352 break; 354 break;
353 } 355 }
354 return err; 356 return err;
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
index df21ad19a94a..7127321ace8c 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k83a.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
@@ -280,7 +280,8 @@ static int rotation_thread_function(void *data)
280 vflip = !vflip; 280 vflip = !vflip;
281 hflip = !hflip; 281 hflip = !hflip;
282 } 282 }
283 s5k83a_set_flip_real((struct gspca_dev *) sd, vflip, hflip); 283 s5k83a_set_flip_real((struct gspca_dev *) sd,
284 vflip, hflip);
284 } 285 }
285 286
286 mutex_unlock(&sd->gspca_dev.usb_lock); 287 mutex_unlock(&sd->gspca_dev.usb_lock);