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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-vp3054-i2c.c
diff --git
a/drivers/media/video/cx88/cx88-vp3054-i2c.c
b/drivers/media/video/cx88/cx88-vp3054-i2c.c
index
751a754
..
6068c9b
100644
(file)
--- a/
drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/
drivers/media/video/cx88/cx88-vp3054-i2c.c
@@
-100,7
+100,6
@@
static struct i2c_algo_bit_data vp3054_i2c_algo_template = {
.getsda = vp3054_bit_getsda,
.getscl = vp3054_bit_getscl,
.udelay = 16,
.getsda = vp3054_bit_getsda,
.getscl = vp3054_bit_getscl,
.udelay = 16,
- .mdelay = 10,
.timeout = 200,
};
.timeout = 200,
};
@@
-169,7
+168,7
@@
void vp3054_i2c_remove(struct cx8802_dev *dev)
dev->core->board != CX88_BOARD_DNTV_LIVE_DVB_T_PRO)
return;
dev->core->board != CX88_BOARD_DNTV_LIVE_DVB_T_PRO)
return;
- i2c_
bit_del_bus
(&vp3054_i2c->adap);
+ i2c_
del_adapter
(&vp3054_i2c->adap);
kfree(vp3054_i2c);
}
kfree(vp3054_i2c);
}