| From 291c8b9b0a1f1e1ac5b46cc266acbee4bfc48b2a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 6 Mar 2021 15:15:28 +0100 |
| Subject: media: platform: sunxi: sun6i-csi: fix error return code of |
| sun6i_video_start_streaming() |
| |
| From: Jia-Ju Bai <baijiaju1990@gmail.com> |
| |
| [ Upstream commit f3d384e36630e2a552d874e422835606d9cf230a ] |
| |
| When sun6i_video_remote_subdev() returns NULL to subdev, no error return |
| code of sun6i_video_start_streaming() is assigned. |
| To fix this bug, ret is assigned with -EINVAL in this case. |
| |
| Reported-by: TOTE Robot <oslab@tsinghua.edu.cn> |
| Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com> |
| Fixes: 5cc7522d8965 ("media: sun6i: Add support for Allwinner CSI V3s") |
| Acked-by: Chen-Yu Tsai <wens@csie.org> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c |
| index b55de9ab64d8..3181d0781b61 100644 |
| --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c |
| +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c |
| @@ -151,8 +151,10 @@ static int sun6i_video_start_streaming(struct vb2_queue *vq, unsigned int count) |
| } |
| |
| subdev = sun6i_video_remote_subdev(video, NULL); |
| - if (!subdev) |
| + if (!subdev) { |
| + ret = -EINVAL; |
| goto stop_media_pipeline; |
| + } |
| |
| config.pixelformat = video->fmt.fmt.pix.pixelformat; |
| config.code = video->mbus_code; |
| -- |
| 2.30.2 |
| |
