diff options
| author | Jean Delvare <khali@linux-fr.org> | 2010-02-19 04:18:41 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-19 06:19:02 +0100 |
| commit | 2434466432464110b5307757e0285dd41f15512e (patch) | |
| tree | 6c12cb51b8c5e1f1ddf83791eda26cbd7a44c740 /drivers/media/video/bt8xx/bttv-driver.c | |
| parent | V4L/DVB: Video : pwc : Fix regression in pwc_set_shutter_speed caused by bad ... (diff) | |
| download | linux-2434466432464110b5307757e0285dd41f15512e.tar.xz linux-2434466432464110b5307757e0285dd41f15512e.zip | |
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.c | 1 |
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 3182a406bdd1..ae08b077fd04 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 */ |