Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / drivers / media / video / cx88 / cx88-i2c.c

diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index fb39f11845583a86dcb463745d66d498bc873efe..375ad53f796124637ed4053040166b739f74d99e 100644 (file)
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/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;
 }
 
 /* ----------------------------------------------------------------------- */