From 4073477b063b8c2d79196b3b2be5f68c5c9ec945 Mon Sep 17 00:00:00 2001 From: Andy Walls Date: Sun, 13 Feb 2011 21:52:50 -0300 Subject: [PATCH] --- yaml --- r: 234051 b: refs/heads/master c: 67914b5c400d6c213f9e56d7547a2038ab5c06f4 h: refs/heads/master i: 234049: ee24a8c11fefc89a558c7d9acd28bfc32f1f397b 234047: 9b182fe55ad8c6319191ffddbee881314fc8766b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-i2c.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a7fe4a3ccc33..1266ca616897 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e192a7cf0effe7680264a5bc35c0ad1bdcdc921c +refs/heads/master: 67914b5c400d6c213f9e56d7547a2038ab5c06f4 diff --git a/trunk/drivers/media/video/cx23885/cx23885-i2c.c b/trunk/drivers/media/video/cx23885/cx23885-i2c.c index ed3d8f55029b..1007f80bd7c1 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-i2c.c +++ b/trunk/drivers/media/video/cx23885/cx23885-i2c.c @@ -122,10 +122,6 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, if (!i2c_wait_done(i2c_adap)) goto eio; - if (!i2c_slave_did_ack(i2c_adap)) { - retval = -ENXIO; - goto err; - } if (i2c_debug) { printk(" addr << 1, msg->buf[0]); if (!(ctrl & I2C_NOSTOP)) @@ -209,10 +205,6 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap, 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]);