From f8a4336d5d453919893064a5cb875710c786e71c Mon Sep 17 00:00:00 2001 From: Dmitri Belimov Date: Mon, 29 Sep 2008 02:25:40 -0300 Subject: [PATCH] --- yaml --- r: 114016 b: refs/heads/master c: 3de2ed127013219efc439c0d052d1cc825da88c2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-core.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1abc642ccd84..8958964a029c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f689d9083a3a46ae3801c37d0dbcb170fc6a9608 +refs/heads/master: 3de2ed127013219efc439c0d052d1cc825da88c2 diff --git a/trunk/drivers/media/video/saa7134/saa7134-core.c b/trunk/drivers/media/video/saa7134/saa7134-core.c index 12872c042f3a..b686bfabbde0 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-core.c +++ b/trunk/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);