aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorDmitri Belimov <d.belimov@gmail.com>2008-09-29 02:25:40 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:37:10 -0200
commit3de2ed127013219efc439c0d052d1cc825da88c2 (patch)
tree87c7d7506664c4abd86b40ff988265a1abadacf4 /drivers/media/video/saa7134
parentf689d9083a3a46ae3801c37d0dbcb170fc6a9608 (diff)
V4L/DVB (9065): saa7134: fix I2C remote controls on saa7134
This is patch for solve this regression. Load ir-kbd-i2c module when remote is i2c type. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 12872c042f3..b686bfabbde 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -699,6 +699,10 @@ static int saa7134_hw_enable2(struct saa7134_dev *dev)
irq2_mask |= SAA7134_IRQ2_INTE_GPIO18A;
}
+ if (dev->has_remote == SAA7134_REMOTE_I2C) {
+ request_module("ir-kbd-i2c");
+ }
+
saa_writel(SAA7134_IRQ1, 0);
saa_writel(SAA7134_IRQ2, irq2_mask);