diff options
Diffstat (limited to 'drivers/media/video/ovcamchip/ov6x30.c')
-rw-r--r-- | drivers/media/video/ovcamchip/ov6x30.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ovcamchip/ov6x30.c b/drivers/media/video/ovcamchip/ov6x30.c index 44a842379b45..6eab458ab792 100644 --- a/drivers/media/video/ovcamchip/ov6x30.c +++ b/drivers/media/video/ovcamchip/ov6x30.c | |||
@@ -301,7 +301,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win) | |||
301 | /******** Palette-specific regs ********/ | 301 | /******** Palette-specific regs ********/ |
302 | 302 | ||
303 | if (win->format == VIDEO_PALETTE_GREY) { | 303 | if (win->format == VIDEO_PALETTE_GREY) { |
304 | if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) { | 304 | if (c->adapter->id == I2C_HW_SMBUS_OV518) { |
305 | /* Do nothing - we're already in 8-bit mode */ | 305 | /* Do nothing - we're already in 8-bit mode */ |
306 | } else { | 306 | } else { |
307 | ov_write_mask(c, 0x13, 0x20, 0x20); | 307 | ov_write_mask(c, 0x13, 0x20, 0x20); |
@@ -313,7 +313,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win) | |||
313 | * Therefore, the OV6630 needs to be in 8-bit multiplexed | 313 | * Therefore, the OV6630 needs to be in 8-bit multiplexed |
314 | * output mode */ | 314 | * output mode */ |
315 | 315 | ||
316 | if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) { | 316 | if (c->adapter->id == I2C_HW_SMBUS_OV518) { |
317 | /* Do nothing - we want to stay in 8-bit mode */ | 317 | /* Do nothing - we want to stay in 8-bit mode */ |
318 | /* Warning: Messing with reg 0x13 breaks OV518 color */ | 318 | /* Warning: Messing with reg 0x13 breaks OV518 color */ |
319 | } else { | 319 | } else { |