From 817722b39b958401877b389ab5552d35b1e367e6 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 28 Jun 2010 12:55:43 -0300
Subject: [PATCH] --- yaml --- r: 202074 b: refs/heads/master c:
 15ceb6b1c30ea40bdbe6a6246e2468d9bab375f5 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/cx88/cx88-cards.c | 1 +
 trunk/drivers/media/video/cx88/cx88-i2c.c   | 6 +++++-
 trunk/drivers/media/video/cx88/cx88.h       | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c24895131624..90b5f01736b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d7b5284d710f42f4c0c0d376d9a6af544c39afd
+refs/heads/master: 15ceb6b1c30ea40bdbe6a6246e2468d9bab375f5
diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c
index 2918a6e38fe8..658ee90db5a4 100644
--- a/trunk/drivers/media/video/cx88/cx88-cards.c
+++ b/trunk/drivers/media/video/cx88/cx88-cards.c
@@ -3498,6 +3498,7 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
 	}
 
 	cx88_card_setup(core);
+	cx88_i2c_init_ir(core);
 	cx88_ir_init(core, pci);
 
 	return core;
diff --git a/trunk/drivers/media/video/cx88/cx88-i2c.c b/trunk/drivers/media/video/cx88/cx88-i2c.c
index fb39f1184558..375ad53f7961 100644
--- a/trunk/drivers/media/video/cx88/cx88-i2c.c
+++ b/trunk/drivers/media/video/cx88/cx88-i2c.c
@@ -181,6 +181,11 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
 	} 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;
@@ -207,7 +212,6 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
 			}
 		}
 	}
-	return core->i2c_rc;
 }
 
 /* ----------------------------------------------------------------------- */
diff --git a/trunk/drivers/media/video/cx88/cx88.h b/trunk/drivers/media/video/cx88/cx88.h
index bdb03d336536..33d161a11725 100644
--- a/trunk/drivers/media/video/cx88/cx88.h
+++ b/trunk/drivers/media/video/cx88/cx88.h
@@ -636,6 +636,7 @@ extern struct videobuf_queue_ops cx8800_vbi_qops;
 /* 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);
 
 
 /* ----------------------------------------------------------- */