summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2010-10-23 18:28:33 +0200
committerMauro Carvalho Chehab2010-12-29 11:16:28 +0100
commit9ab66912e0cd671fbea1b99e8a37d11b14d50baf (patch)
tree01fbcb21c8d3f7d90360d7c410c07152aba7ecd6 /drivers/media/video/cx231xx/cx231xx-cards.c
parent[media] Add DVB support for SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG (diff)
downloadkernel-qcow2-linux-9ab66912e0cd671fbea1b99e8a37d11b14d50baf.tar.gz
kernel-qcow2-linux-9ab66912e0cd671fbea1b99e8a37d11b14d50baf.tar.xz
kernel-qcow2-linux-9ab66912e0cd671fbea1b99e8a37d11b14d50baf.zip
[media] cx231xx: Add a driver for I2C-based IR
Although cx231xx has a very good IR support, already supported by mceusb driver, some designs decided to add a separate I2C microcontroller chip in order to handle IR. Due to that, add a glue to ir-kbd-i2c is needed, in order to support those devices. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-cards.c')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-cards.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index 400447fbf7fb..0a06fcac9db9 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -663,8 +663,11 @@ void cx231xx_release_resources(struct cx231xx *dev)
cx231xx_remove_from_devlist(dev);
+ /* Release I2C buses */
cx231xx_dev_uninit(dev);
+ cx231xx_ir_exit(dev);
+
usb_put_dev(dev->udev);
/* Mark device as unused */
@@ -782,6 +785,8 @@ static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev,
goto fail_reg_devices;
}
+ cx231xx_ir_init(dev);
+
cx231xx_init_extension(dev);
return 0;