diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-27 14:09:35 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-27 14:09:35 -0200 |
| commit | 3a6b5dfd2270a9ddcdf2b81e4dfa9388a343b0cd (patch) | |
| tree | fb366a5eeb327b59981f5119fd88341894f63330 /linux/drivers/media/video/bt8xx/bttv-i2c.c | |
| parent | 538526dca5f2ca9e027d129c6d1931c2fe94829d (diff) | |
| download | mediapointer-dvb-s2-3a6b5dfd2270a9ddcdf2b81e4dfa9388a343b0cd.tar.gz mediapointer-dvb-s2-3a6b5dfd2270a9ddcdf2b81e4dfa9388a343b0cd.tar.bz2 | |
Backport some changes that happened at mainstream
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Basic changes:
- replaced i2c_bit_del_bus() to i2c_del_adapter();
- Fixed MODULE_AUTHOR on ov7670
- Updates on drivers not maintained on this tree: i2c-id.h and sound/*
kernel-sync:
drivers/media/dvb/pluto2/pluto2.c | 8 ++++----
drivers/media/video/bt8xx/bttv-i2c.c | 6 +-----
drivers/media/video/cx88/cx88-core.c | 2 +-
drivers/media/video/cx88/cx88-vp3054-i2c.c | 2 +-
drivers/media/video/ov7670.c | 2 +-
drivers/media/video/vino.c | 2 +-
drivers/media/video/zoran_card.c | 2 +-
include/linux/i2c-id.h | 18 ++++++------------
sound/pci/bt87x.c | 4 ++--
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-i2c.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-i2c.c b/linux/drivers/media/video/bt8xx/bttv-i2c.c index 7a3da391d..68522754a 100644 --- a/linux/drivers/media/video/bt8xx/bttv-i2c.c +++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c @@ -497,11 +497,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); } /* |