[1/2] V4L/DVB: cx88: Move I2C IR initialization

Commit Message

Jean Delvare June 28, 2010, 3:55 p.m. UTC

None

Patch

--- linux-2.6.34-rc3.orig/drivers/media/video/cx88/cx88-cards.c	2010-04-09 10:55:01.000000000 +0200
+++ linux-2.6.34-rc3/drivers/media/video/cx88/cx88-cards.c	2010-04-09 17:53:58.000000000 +0200
@@ -3498,6 +3498,7 @@  struct cx88_core *cx88_core_create(struc
 	}
 
 	cx88_card_setup(core);
+	cx88_i2c_init_ir(core);
 	cx88_ir_init(core, pci);
 
 	return core;
--- linux-2.6.34-rc3.orig/drivers/media/video/cx88/cx88-i2c.c	2010-04-09 14:04:04.000000000 +0200
+++ linux-2.6.34-rc3/drivers/media/video/cx88/cx88-i2c.c	2010-04-09 17:53:58.000000000 +0200
@@ -181,6 +181,11 @@  int cx88_i2c_init(struct cx88_core *core
 	} else
 		printk("%s: i2c register FAILED\n", core->name);
 
+	return core->i2c_rc;
+}
+
+void cx88_i2c_init_ir(struct cx88_core *core)
+{
 	/* Instantiate the IR receiver device, if present */
 	if (0 == core->i2c_rc) {
 		struct i2c_board_info info;
@@ -196,7 +201,6 @@  int cx88_i2c_init(struct cx88_core *core
 		i2c_new_probed_device(&core->i2c_adap, &info, addr_list,
 				      i2c_probe_func_quick_read);
 	}
-	return core->i2c_rc;
 }
 
 /* ----------------------------------------------------------------------- */
--- linux-2.6.34-rc3.orig/drivers/media/video/cx88/cx88.h	2010-04-03 18:40:32.000000000 +0200
+++ linux-2.6.34-rc3/drivers/media/video/cx88/cx88.h	2010-04-09 17:53:58.000000000 +0200
@@ -636,6 +636,7 @@  extern struct videobuf_queue_ops cx8800_
 /* cx88-i2c.c                                                  */
 
 extern int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci);
+extern void cx88_i2c_init_ir(struct cx88_core *core);
 
 
 /* ----------------------------------------------------------- */