Commit 24344664 authored by Jean Delvare's avatar Jean Delvare Committed by Mauro Carvalho Chehab

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=15184Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
CC: stable@kernel.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 53f68607
...@@ -4461,6 +4461,7 @@ static int __devinit bttv_probe(struct pci_dev *dev, ...@@ -4461,6 +4461,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
request_modules(btv); request_modules(btv);
} }
init_bttv_i2c_ir(btv);
bttv_input_init(btv); bttv_input_init(btv);
/* everything is fine */ /* everything is fine */
......
...@@ -388,7 +388,12 @@ int __devinit init_bttv_i2c(struct bttv *btv) ...@@ -388,7 +388,12 @@ int __devinit init_bttv_i2c(struct bttv *btv)
if (0 == btv->i2c_rc && i2c_scan) if (0 == btv->i2c_rc && i2c_scan)
do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client); do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client);
/* Instantiate the IR receiver device, if present */ return btv->i2c_rc;
}
/* Instantiate the I2C IR receiver device, if present */
void __devinit init_bttv_i2c_ir(struct bttv *btv)
{
if (0 == btv->i2c_rc) { if (0 == btv->i2c_rc) {
struct i2c_board_info info; struct i2c_board_info info;
/* The external IR receiver is at i2c address 0x34 (0x35 for /* The external IR receiver is at i2c address 0x34 (0x35 for
...@@ -408,7 +413,6 @@ int __devinit init_bttv_i2c(struct bttv *btv) ...@@ -408,7 +413,6 @@ int __devinit init_bttv_i2c(struct bttv *btv)
strlcpy(info.type, "ir_video", I2C_NAME_SIZE); strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list); i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list);
} }
return btv->i2c_rc;
} }
int __devexit fini_bttv_i2c(struct bttv *btv) int __devexit fini_bttv_i2c(struct bttv *btv)
......
...@@ -279,6 +279,7 @@ extern unsigned int bttv_debug; ...@@ -279,6 +279,7 @@ extern unsigned int bttv_debug;
extern unsigned int bttv_gpio; extern unsigned int bttv_gpio;
extern void bttv_gpio_tracking(struct bttv *btv, char *comment); extern void bttv_gpio_tracking(struct bttv *btv, char *comment);
extern int init_bttv_i2c(struct bttv *btv); extern int init_bttv_i2c(struct bttv *btv);
extern void init_bttv_i2c_ir(struct bttv *btv);
extern int fini_bttv_i2c(struct bttv *btv); extern int fini_bttv_i2c(struct bttv *btv);
#define bttv_printk if (bttv_verbose) printk #define bttv_printk if (bttv_verbose) printk
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment