git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
media
/
video
/
ovcamchip
/
ov6x20.c
diff --git
a/drivers/media/video/ovcamchip/ov6x20.c
b/drivers/media/video/ovcamchip/ov6x20.c
index
3433619
..
c04130d
100644
(file)
--- 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)
DDEBUG(4, &c->dev, "entered");
switch (c->adapter->id) {
DDEBUG(4, &c->dev, "entered");
switch (c->adapter->id) {
- case I2C_
ALGO_SMBUS | I2C_
HW_SMBUS_OV511:
+ case I2C_HW_SMBUS_OV511:
rc = ov_write_regvals(c, regvals_init_6x20_511);
break;
rc = ov_write_regvals(c, regvals_init_6x20_511);
break;
- case I2C_
ALGO_SMBUS | I2C_
HW_SMBUS_OV518:
+ case I2C_HW_SMBUS_OV518:
rc = ov_write_regvals(c, regvals_init_6x20_518);
break;
default:
rc = ov_write_regvals(c, regvals_init_6x20_518);
break;
default:
@@
-178,10
+178,9
@@
static int ov6x20_init(struct i2c_client *c)
if (rc < 0)
return rc;
if (rc < 0)
return rc;
- ov->spriv = s = k
m
alloc(sizeof *s, GFP_KERNEL);
+ ov->spriv = s = k
z
alloc(sizeof *s, GFP_KERNEL);
if (!s)
return -ENOMEM;
if (!s)
return -ENOMEM;
- memset(s, 0, sizeof *s);
s->auto_brt = 1;
s->auto_exp = 1;
s->auto_brt = 1;
s->auto_exp = 1;
@@
-338,7
+337,7
@@
static int ov6x20_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
/******** Palette-specific regs ********/
/* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */
/******** Palette-specific regs ********/
/* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */
- if (c->adapter->id ==
(I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)
) {
+ if (c->adapter->id ==
I2C_HW_SMBUS_OV518
) {
if (win->format == VIDEO_PALETTE_GREY)
ov_write_mask(c, 0x13, 0x00, 0x20);
else
if (win->format == VIDEO_PALETTE_GREY)
ov_write_mask(c, 0x13, 0x00, 0x20);
else