]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: i2c: ov2659: fix s_stream return value
authorBenoit Parrot <bparrot@ti.com>
Mon, 30 Sep 2019 13:06:40 +0000 (10:06 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:43:21 +0000 (16:43 +0100)
[ Upstream commit 85c4043f1d403c222d481dfc91846227d66663fb ]

In ov2659_s_stream() return value for invoked function should be checked
and propagated.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/i2c/ov2659.c

index f4ded0669ff9eb71110e55fe897a3ca2cf3c66b3..70bf63b9dbd046a7ee5a5d8c3730945c311ff7c0 100644 (file)
@@ -1201,11 +1201,15 @@ static int ov2659_s_stream(struct v4l2_subdev *sd, int on)
                goto unlock;
        }
 
-       ov2659_set_pixel_clock(ov2659);
-       ov2659_set_frame_size(ov2659);
-       ov2659_set_format(ov2659);
-       ov2659_set_streaming(ov2659, 1);
-       ov2659->streaming = on;
+       ret = ov2659_set_pixel_clock(ov2659);
+       if (!ret)
+               ret = ov2659_set_frame_size(ov2659);
+       if (!ret)
+               ret = ov2659_set_format(ov2659);
+       if (!ret) {
+               ov2659_set_streaming(ov2659, 1);
+               ov2659->streaming = on;
+       }
 
 unlock:
        mutex_unlock(&ov2659->lock);