summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorWei Yongjun <weiyj.lk@gmail.com>2016-08-04 05:31:22 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-08-24 13:47:02 -0300
commitb956fb2d2e562a344df41a8f2fc51314bac5b300 (patch)
tree1c9fbec1c9f46e63edfc7b2597058d7878ad4988 /drivers/media/i2c
parent69d4a521586ef93db94451afa5072ec3f6bee401 (diff)
downloadlinux-stable-b956fb2d2e562a344df41a8f2fc51314bac5b300.tar.gz
linux-stable-b956fb2d2e562a344df41a8f2fc51314bac5b300.tar.bz2
linux-stable-b956fb2d2e562a344df41a8f2fc51314bac5b300.zip
[media] adv7511: fix error return code in adv7511_probe()
Fix to return error code -ENOMEM from the i2c client register error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/adv7511.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c
index 53030d631653..5ba0f21bcfe4 100644
--- a/drivers/media/i2c/adv7511.c
+++ b/drivers/media/i2c/adv7511.c
@@ -1898,6 +1898,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id *
state->i2c_cec_addr >> 1);
if (state->i2c_cec == NULL) {
v4l2_err(sd, "failed to register cec i2c client\n");
+ err = -ENOMEM;
goto err_unreg_edid;
}
adv7511_wr(sd, 0xe2, 0x00); /* power up cec section */