diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-23 12:28:33 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:16:28 -0500 |
commit | 9ab66912e0cd671fbea1b99e8a37d11b14d50baf (patch) | |
tree | 01fbcb21c8d3f7d90360d7c410c07152aba7ecd6 /drivers/media/video/cx231xx/cx231xx-cards.c | |
parent | f0551efc77b0f34a93a14d2bf96051612e352a39 (diff) |
[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.c | 5 |
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) | |||
663 | 663 | ||
664 | cx231xx_remove_from_devlist(dev); | 664 | cx231xx_remove_from_devlist(dev); |
665 | 665 | ||
666 | /* Release I2C buses */ | ||
666 | cx231xx_dev_uninit(dev); | 667 | cx231xx_dev_uninit(dev); |
667 | 668 | ||
669 | cx231xx_ir_exit(dev); | ||
670 | |||
668 | usb_put_dev(dev->udev); | 671 | usb_put_dev(dev->udev); |
669 | 672 | ||
670 | /* Mark device as unused */ | 673 | /* Mark device as unused */ |
@@ -782,6 +785,8 @@ static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev, | |||
782 | goto fail_reg_devices; | 785 | goto fail_reg_devices; |
783 | } | 786 | } |
784 | 787 | ||
788 | cx231xx_ir_init(dev); | ||
789 | |||
785 | cx231xx_init_extension(dev); | 790 | cx231xx_init_extension(dev); |
786 | 791 | ||
787 | return 0; | 792 | return 0; |