diff options
Diffstat (limited to 'drivers/media/video/ovcamchip/ov6x20.c')
-rw-r--r-- | drivers/media/video/ovcamchip/ov6x20.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ovcamchip/ov6x20.c b/drivers/media/video/ovcamchip/ov6x20.c index 3433619ad93f..b3f4d266cede 100644 --- a/drivers/media/video/ovcamchip/ov6x20.c +++ b/drivers/media/video/ovcamchip/ov6x20.c | |||
@@ -164,10 +164,10 @@ static int ov6x20_init(struct i2c_client *c) | |||
164 | DDEBUG(4, &c->dev, "entered"); | 164 | DDEBUG(4, &c->dev, "entered"); |
165 | 165 | ||
166 | switch (c->adapter->id) { | 166 | switch (c->adapter->id) { |
167 | case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511: | 167 | case I2C_HW_SMBUS_OV511: |
168 | rc = ov_write_regvals(c, regvals_init_6x20_511); | 168 | rc = ov_write_regvals(c, regvals_init_6x20_511); |
169 | break; | 169 | break; |
170 | case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518: | 170 | case I2C_HW_SMBUS_OV518: |
171 | rc = ov_write_regvals(c, regvals_init_6x20_518); | 171 | rc = ov_write_regvals(c, regvals_init_6x20_518); |
172 | break; | 172 | break; |
173 | default: | 173 | default: |
@@ -338,7 +338,7 @@ static int ov6x20_mode_init(struct i2c_client *c, struct ovcamchip_window *win) | |||
338 | /******** Palette-specific regs ********/ | 338 | /******** Palette-specific regs ********/ |
339 | 339 | ||
340 | /* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */ | 340 | /* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */ |
341 | if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) { | 341 | if (c->adapter->id == I2C_HW_SMBUS_OV518) { |
342 | if (win->format == VIDEO_PALETTE_GREY) | 342 | if (win->format == VIDEO_PALETTE_GREY) |
343 | ov_write_mask(c, 0x13, 0x00, 0x20); | 343 | ov_write_mask(c, 0x13, 0x00, 0x20); |
344 | else | 344 | else |