aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt8xx/bttv-driver.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2010-02-19 00:18:41 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-19 03:19:02 -0200
commit2434466432464110b5307757e0285dd41f15512e (patch)
tree6c12cb51b8c5e1f1ddf83791eda26cbd7a44c740 /drivers/media/video/bt8xx/bttv-driver.c
parent53f68607caba85db9a73846ccd289e4b7fa96295 (diff)
downloadkernel_samsung_smdk4412-2434466432464110b5307757e0285dd41f15512e.zip
kernel_samsung_smdk4412-2434466432464110b5307757e0285dd41f15512e.tar.gz
kernel_samsung_smdk4412-2434466432464110b5307757e0285dd41f15512e.tar.bz2
V4L/DVB: bttv: Move I2C IR initialization
Move I2C IR initialization from just after I2C bus setup to right before non-I2C IR initialization. This avoids the case where an I2C IR device is blocking audio support (at least the PV951 suffers from this). It is also more logical to group IR support together, regardless of the connectivity. This fixes bug #15184: http://bugzilla.kernel.org/show_bug.cgi?id=15184 Signed-off-by: Jean Delvare <khali@linux-fr.org> CC: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-driver.c')
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 3182a40..ae08b07 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -4461,6 +4461,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
request_modules(btv);
}
+ init_bttv_i2c_ir(btv);
bttv_input_init(btv);
/* everything is fine */