Commit 67914b5c authored Feb 13, 2011 by Andy Walls Committed by Mauro Carvalho Chehab Mar 02, 2011

[media] cx23885: Revert "Check for slave nack on all transactions"



This reverts commit 44835f19.

With the CX23885 hardware I2C master, checking for I2C slave ACK/NAK
is not valid when the I2C_EXTEND or I2C_NOSTOP bits are set.
Revert the commit that checks for I2C slave ACK/NAK on all transactions,
so that XC5000 tuners work with the CX23885 again.

Thanks go to Mark Zimmerman for reporting and bisecting this problem.

Bisected-by: Mark Zimmerman <markzimm@frii.com>

Reported-by: Mark Zimmerman <markzimm@frii.com>
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent e192a7cf

drivers/media/video/cx23885/cx23885-i2c.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -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(" <W %02x %02x", msg->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]);