summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2021-06-17 09:23:29 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-18 13:40:20 +0200
commit23e5fb6475897f3ad380781883ae6d5440daa8b6 (patch)
tree3cf903df611f09b1c3bce5724b6a742a2cfb33b8
parente5cecb9105d45ad7955e202e048441920595d78b (diff)
downloadlinux-stable-23e5fb6475897f3ad380781883ae6d5440daa8b6.tar.gz
linux-stable-23e5fb6475897f3ad380781883ae6d5440daa8b6.tar.bz2
linux-stable-23e5fb6475897f3ad380781883ae6d5440daa8b6.zip
media: atomisp: pci: fix error return code in atomisp_pci_probe()
[ Upstream commit d14e272958bdfdc40dcafb827d24ba6fdafa9d52 ] If init_atomisp_wdts() fails, atomisp_pci_probe() need return error code. Link: https://lore.kernel.org/linux-media/20210617072329.1233662-1-yangyingliang@huawei.com Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp_v4l2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index 02f774ed80c8..fa1bd99cd6f1 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -1763,7 +1763,8 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
if (err < 0)
goto register_entities_fail;
/* init atomisp wdts */
- if (init_atomisp_wdts(isp) != 0)
+ err = init_atomisp_wdts(isp);
+ if (err != 0)
goto wdt_work_queue_fail;
/* save the iunit context only once after all the values are init'ed. */