V4L/DVB: cx23885: Return -ENXIO on slave nack

[cascardo/linux.git] / drivers / media / video / cx23885 / cx23885-i2c.c

diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index 4172cb3..154c914 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -99,7 +99,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                if (!i2c_wait_done(i2c_adap))
                        return -EIO;
                if (!i2c_slave_did_ack(i2c_adap))
-                       return -EIO;
+                       return -ENXIO;
 
                dprintk(1, "%s() returns 0\n", __func__);
                return 0;
@@ -185,7 +185,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
                if (!i2c_wait_done(i2c_adap))
                        return -EIO;
                if (!i2c_slave_did_ack(i2c_adap))
-                       return -EIO;
+                       return -ENXIO;
 
 
                dprintk(1, "%s() returns 0\n", __func__);
@@ -365,7 +365,17 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
 
                memset(&info, 0, sizeof(struct i2c_board_info));
                strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
-               i2c_new_probed_device(&bus->i2c_adap, &info, addr_list);
+               /*
+                * We can't call i2c_new_probed_device() because it uses
+                * quick writes for probing and the IR receiver device only
+                * replies to reads.
+                */
+               if (i2c_smbus_xfer(&bus->i2c_adap, addr_list[0], 0,
+                                  I2C_SMBUS_READ, 0, I2C_SMBUS_QUICK,
+                                  NULL) >= 0) {
+                       info.addr = addr_list[0];
+                       i2c_new_device(&bus->i2c_adap, &info);
+               }
        }
 
        return bus->i2c_rc;