V4L/DVB: bttv: Move I2C IR initialization
commitdcb086ecb08c4ff8de15b553f07a8f0fc69dd31f
authorJean Delvare <khali@linux-fr.org>
Fri, 19 Feb 2010 03:18:41 +0000 (19 00:18 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 15 Mar 2010 15:49:33 +0000 (15 08:49 -0700)
tree2c7e97f0c133049301768703ccd1b39579a49d21
parenta0497206defc4bc38a6bef6cb3b9bbed6be3ff50
V4L/DVB: bttv: Move I2C IR initialization

commit 2434466432464110b5307757e0285dd41f15512e upstream.

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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/media/video/bt8xx/bttv-driver.c
drivers/media/video/bt8xx/bttv-i2c.c
drivers/media/video/bt8xx/bttvp.h