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 ee1ca39db06ad684758dc4da0bfa8b35aa8e1f56..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;
@@ -188,12 +193,25 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
                        0x18, 0x6b, 0x71,
                        I2C_CLIENT_END
                };
+               const unsigned short *addrp;
 
                memset(&info, 0, sizeof(struct i2c_board_info));
                strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
-               i2c_new_probed_device(&core->i2c_adap, &info, addr_list);
+               /*
+                * We can't call i2c_new_probed_device() because it uses
+                * quick writes for probing and at least some R receiver
+                * devices only reply to reads.
+                */
+               for (addrp = addr_list; *addrp != I2C_CLIENT_END; addrp++) {
+                       if (i2c_smbus_xfer(&core->i2c_adap, *addrp, 0,
+                                          I2C_SMBUS_READ, 0,
+                                          I2C_SMBUS_QUICK, NULL) >= 0) {
+                               info.addr = *addrp;
+                               i2c_new_device(&core->i2c_adap, &info);
+                               break;
+                       }
+               }
        }
-       return core->i2c_rc;
 }
 
 /* ----------------------------------------------------------------------- */