From 64472d8fc6a44e23a02027c5efd0a8c1237fdd11 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 18 Jul 2010 17:05:17 -0300 Subject: [PATCH] --- yaml --- r: 208125 b: refs/heads/master c: 18a87becf85d50e7f3d547f1b7a75108b151374d h: refs/heads/master i: 208123: 216fa96deee08d5ea628095d4af5e6346582eaa0 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-i2c.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 55e9c0f56533..2d10736c34dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44835f197bf1e3f57464f23dfb239fef06cf89be +refs/heads/master: 18a87becf85d50e7f3d547f1b7a75108b151374d diff --git a/trunk/drivers/media/video/cx23885/cx23885-i2c.c b/trunk/drivers/media/video/cx23885/cx23885-i2c.c index afb8d6f91d14..1a391486e551 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-i2c.c +++ b/trunk/drivers/media/video/cx23885/cx23885-i2c.c @@ -120,10 +120,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_slave_did_ack(i2c_adap)) { retval = -ENXIO; @@ -149,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]); @@ -213,10 +207,7 @@ 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;