| Message ID | 20210617072329.1233662-1-yangyingliang@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [-next] media: staging: media: atomisp: pci: fix error return code in atomisp_pci_probe() | expand |
On Thu, Jun 17, 2021 at 03:23:29PM +0800, Yang Yingliang wrote: > If init_atomisp_wdts() fails, atomisp_pci_probe() need return > error code. > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c > index 948769ca6539..5de878fe798b 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) Change this to: if (err). Only use != 0 when you are talking about numbers or for strcmp(). if (num != 0) // it's fine because we are talking about zero as // number zero. if (len == 0) // fine, length is measured in numbers. if (err != 0) // In this case, error is not a number but either // an error code or success. It's not like -3 is // worse than -2 or anything like that. It's not // a count or a measurement. For (strcmp(a, b) != 0), the != means "a != b". regards, dan carpenter
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c index 948769ca6539..5de878fe798b 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. */
If init_atomisp_wdts() fails, atomisp_pci_probe() need return error code. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)