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/dvb/pluto2 | |
| 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/dvb/pluto2')
| -rw-r--r-- | linux/drivers/media/dvb/pluto2/pluto2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/pluto2/pluto2.c b/linux/drivers/media/dvb/pluto2/pluto2.c index 3de55e0cc..cb049d1a8 100644 --- a/linux/drivers/media/dvb/pluto2/pluto2.c +++ b/linux/drivers/media/dvb/pluto2/pluto2.c @@ -654,7 +654,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev, /* dvb */ ret = dvb_register_adapter(&pluto->dvb_adapter, DRIVER_NAME, THIS_MODULE, &pdev->dev); if (ret < 0) - goto err_i2c_bit_del_bus; + goto err_i2c_del_adapter; dvb_adapter = &pluto->dvb_adapter; @@ -716,8 +716,8 @@ err_dvb_dmx_release: dvb_dmx_release(dvbdemux); err_dvb_unregister_adapter: dvb_unregister_adapter(dvb_adapter); -err_i2c_bit_del_bus: - i2c_bit_del_bus(&pluto->i2c_adap); +err_i2c_del_adapter: + i2c_del_adapter(&pluto->i2c_adap); err_pluto_hw_exit: pluto_hw_exit(pluto); err_free_irq: @@ -752,7 +752,7 @@ static void __devexit pluto2_remove(struct pci_dev *pdev) dvb_dmxdev_release(&pluto->dmxdev); dvb_dmx_release(dvbdemux); dvb_unregister_adapter(dvb_adapter); - i2c_bit_del_bus(&pluto->i2c_adap); + i2c_del_adapter(&pluto->i2c_adap); pluto_hw_exit(pluto); free_irq(pdev->irq, pluto); pci_iounmap(pdev, pluto->io_mem); |