aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-cards.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2010-06-28 11:55:43 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 14:32:25 -0400
commit15ceb6b1c30ea40bdbe6a6246e2468d9bab375f5 (patch)
tree3c92390e10daef2f86d27def563a7212ac5a2cbf /drivers/media/video/cx88/cx88-cards.c
parent7d7b5284d710f42f4c0c0d376d9a6af544c39afd (diff)
V4L/DVB: cx88: Move I2C IR initialization
Move I2C IR initialization from just after I2C bus setup to right before non-I2C IR initialization. This is the same as was done for the bttv driver several months ago. Might solve bugs which have not yet been reported for some cards. It makes both drivers consistent, and makes it easier to disable IR support (coming soon.) Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88/cx88-cards.c')
-rw-r--r--drivers/media/video/cx88/cx88-cards.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 2918a6e38fe8..658ee90db5a4 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -3498,6 +3498,7 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
3498 } 3498 }
3499 3499
3500 cx88_card_setup(core); 3500 cx88_card_setup(core);
3501 cx88_i2c_init_ir(core);
3501 cx88_ir_init(core, pci); 3502 cx88_ir_init(core, pci);
3502 3503
3503 return core; 3504 return core;