Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (94 commits)
  V4L/DVB: tvp7002: fix write to H-PLL Feedback Divider LSB register
  V4L/DVB: dvb: siano: free spinlock before schedule()
  V4L/DVB: media: video: pvrusb2: remove custom hex_to_bin()
  V4L/DVB: drivers: usbvideo: remove custom implementation of hex_to_bin()
  V4L/DVB: Report supported QAM modes on bt8xx
  V4L/DVB: media: ir-keytable: null dereference in debug code
  V4L/DVB: ivtv: convert to the new control framework
  V4L/DVB: ivtv: convert gpio subdev to new control framework
  V4L/DVB: wm8739: convert to the new control framework
  V4L/DVB: cs53l32a: convert to new control framework
  V4L/DVB: wm8775: convert to the new control framework
  V4L/DVB: cx2341x: convert to the control framework
  V4L/DVB: cx25840: convert to the new control framework
  V4L/DVB: cx25840/ivtv: replace ugly priv control with s_config
  V4L/DVB: saa717x: convert to the new control framework
  V4L/DVB: msp3400: convert to the new control framework
  V4L/DVB: saa7115: convert to the new control framework
  V4L/DVB: v4l2: hook up the new control framework into the core framework
  V4L/DVB: Documentation: add v4l2-controls.txt documenting the new controls API
  V4L/DVB: v4l2-ctrls: Whitespace cleanups
  ...

1 files changed, 13 insertions, 14 deletions

diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index d4746e064516..1a391486e551 100644
--- 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;
@@ -120,11 +120,12 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
         cx_write(bus->reg_wdata, wdata);
         cx_write(bus->reg_ctrl, ctrl);
 
-        retval = i2c_wait_done(i2c_adap);
-        if (retval < 0)
-                goto err;
-        if (retval == 0)
+        if (!i2c_wait_done(i2c_adap))
                 goto eio;
+        if (!i2c_slave_did_ack(i2c_adap)) {
+                retval = -ENXIO;
+                goto err;
+        }
         if (i2c_debug) {
                 printk(" <W %02x %02x", msg->addr << 1, msg->buf[0]);
                 if (!(ctrl & I2C_NOSTOP))
@@ -145,10 +146,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                 cx_write(bus->reg_wdata, wdata);
                 cx_write(bus->reg_ctrl, ctrl);
 
-                retval = i2c_wait_done(i2c_adap);
-                if (retval < 0)
-                        goto err;
-                if (retval == 0)
+                if (!i2c_wait_done(i2c_adap))
                         goto eio;
                 if (i2c_debug) {
                         dprintk(1, " %02x", msg->buf[cnt]);
@@ -185,7 +183,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__);
@@ -209,11 +207,12 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
                 cx_write(bus->reg_addr, msg->addr << 25);
                 cx_write(bus->reg_ctrl, ctrl);
 
-                retval = i2c_wait_done(i2c_adap);
-                if (retval < 0)
-                        goto err;
-                if (retval == 0)
+                if (!i2c_wait_done(i2c_adap))
                         goto eio;
+                if (cnt == 0 && !i2c_slave_did_ack(i2c_adap)) {
+                        retval = -ENXIO;
+                        goto err;
+                }
                 msg->buf[cnt] = cx_read(bus->reg_rdata) & 0xff;
                 if (i2c_debug) {
                         dprintk(1, " %02x", msg->buf[cnt]);