From: Javier Martinez Canillas <javier@osg.samsung.com>
Date: Fri, 15 Apr 2016 01:00:08 +0000 (-0300)
Subject: [media] tvp5150: propagate I2C write error in .s_register callback
X-Git-Tag: v4.7-rc1~130^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eca4ca84a965d7fcc3430439898d0728818edc56;p=karo-tx-linux.git

[media] tvp5150: propagate I2C write error in .s_register callback

The tvp5150_write() function can fail so don't return 0 unconditionally
in tvp5150_s_register() but propagate what's returned by tvp5150_write().

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 283836514e6a..0b6d46c453bf 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -1161,8 +1161,7 @@ static int tvp5150_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *
 
 static int tvp5150_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_register *reg)
 {
-	tvp5150_write(sd, reg->reg & 0xff, reg->val & 0xff);
-	return 0;
+	return tvp5150_write(sd, reg->reg & 0xff, reg->val & 0xff);
 }
 #endif