git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
bt8xx
/
bttv-i2c.c
diff --git
a/drivers/media/video/bt8xx/bttv-i2c.c
b/drivers/media/video/bt8xx/bttv-i2c.c
index 70de6c96e201c9dba69a010d1b40d9d8294bc64a..62b873076e09fb7e9798815d3787f17f59dfb589 100644
(file)
--- a/
drivers/media/video/bt8xx/bttv-i2c.c
+++ b/
drivers/media/video/bt8xx/bttv-i2c.c
@@
-479,11
+479,7
@@
int __devexit fini_bttv_i2c(struct bttv *btv)
if (0 != btv->i2c_rc)
return 0;
- if (btv->use_i2c_hw) {
- return i2c_del_adapter(&btv->c.i2c_adap);
- } else {
- return i2c_bit_del_bus(&btv->c.i2c_adap);
- }
+ return i2c_del_adapter(&btv->c.i2c_adap);
}
/*