| From 302bf8cb2df08382c5a875f5c5f4eb6254b3148e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 17 Nov 2020 03:50:41 +0100 |
| Subject: media: omap4iss: return error code when omap4iss_get() failed |
| |
| From: Yang Yingliang <yangyingliang@huawei.com> |
| |
| [ Upstream commit 8938c48fa25b491842ece9eb38f0bea0fcbaca44 ] |
| |
| If omap4iss_get() failed, it need return error code in iss_probe(). |
| |
| Fixes: 59f0ad807681 ("[media] v4l: omap4iss: Add support for OMAP4...") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> |
| 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/staging/media/omap4iss/iss.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c |
| index e06ea7ea1e50..3dac35f68238 100644 |
| --- a/drivers/staging/media/omap4iss/iss.c |
| +++ b/drivers/staging/media/omap4iss/iss.c |
| @@ -1236,8 +1236,10 @@ static int iss_probe(struct platform_device *pdev) |
| if (ret < 0) |
| goto error; |
| |
| - if (!omap4iss_get(iss)) |
| + if (!omap4iss_get(iss)) { |
| + ret = -EINVAL; |
| goto error; |
| + } |
| |
| ret = iss_reset(iss); |
| if (ret < 0) |
| -- |
| 2.30.2 |
| |
