summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/dvb-usb-v2/ec168.c
diff options
context:
space:
mode:
authorJulia Lawall2013-12-29 23:47:18 +0100
committerMauro Carvalho Chehab2014-01-07 12:19:03 +0100
commit6c49d79381f4bacacdef50a1902c92833e765c63 (patch)
tree91a7a6994655dccddbf222b0fdba612815fbd7ee /drivers/media/usb/dvb-usb-v2/ec168.c
parent[media] as102: fix leaks at failure paths in as102_usb_probe() (diff)
downloadkernel-qcow2-linux-6c49d79381f4bacacdef50a1902c92833e765c63.tar.gz
kernel-qcow2-linux-6c49d79381f4bacacdef50a1902c92833e765c63.tar.xz
kernel-qcow2-linux-6c49d79381f4bacacdef50a1902c92833e765c63.zip
[media] ec168: fix error return code
The rest of the function uses ret to store the return value, even setting ret to i a few lines before this, so return ret instead of i. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Cc: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2/ec168.c')
-rw-r--r--drivers/media/usb/dvb-usb-v2/ec168.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/ec168.c b/drivers/media/usb/dvb-usb-v2/ec168.c
index 5c68f3918bc8..0c2b377704ff 100644
--- a/drivers/media/usb/dvb-usb-v2/ec168.c
+++ b/drivers/media/usb/dvb-usb-v2/ec168.c
@@ -170,7 +170,7 @@ static int ec168_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
error:
mutex_unlock(&d->i2c_mutex);
- return i;
+ return ret;
}
static u32 ec168_i2c_func(struct i2c_adapter *adapter)