Message ID | 20210524133550.2363884-1-weiyongjun1@huawei.com |
---|---|
State | Not Applicable |
Headers | show |
Series | [-next] media: staging: tegra-vde: Fix error return code in tegra_vde_probe() | expand |
24.05.2021 16:35, Wei Yongjun пишет: > Fix to return a negative error code from the error handling > case instead of 0, as done elsewhere in this function. > > Fixes: dc8276b78917 ("staging: media: tegra-vde: use pm_runtime_resume_and_get()") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/staging/media/tegra-vde/vde.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/tegra-vde/vde.c > index e025b69776f2..321d14ba2e56 100644 > --- a/drivers/staging/media/tegra-vde/vde.c > +++ b/drivers/staging/media/tegra-vde/vde.c > @@ -1071,7 +1071,8 @@ static int tegra_vde_probe(struct platform_device *pdev) > * power-cycle it in order to put hardware into a predictable lower > * power state. > */ > - if (pm_runtime_resume_and_get(dev) < 0) > + err = pm_runtime_resume_and_get(dev); > + if (err < 0) > goto err_pm_runtime; > > pm_runtime_put(dev); > pm_runtime_resume_and_get() doesn't return positive values, the previous variant was okay. You should also version your patches and add changelog.
24.05.2021 16:27, Dmitry Osipenko пишет: > 24.05.2021 16:35, Wei Yongjun пишет: >> Fix to return a negative error code from the error handling >> case instead of 0, as done elsewhere in this function. >> >> Fixes: dc8276b78917 ("staging: media: tegra-vde: use pm_runtime_resume_and_get()") >> Reported-by: Hulk Robot <hulkci@huawei.com> >> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> >> --- >> drivers/staging/media/tegra-vde/vde.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/tegra-vde/vde.c >> index e025b69776f2..321d14ba2e56 100644 >> --- a/drivers/staging/media/tegra-vde/vde.c >> +++ b/drivers/staging/media/tegra-vde/vde.c >> @@ -1071,7 +1071,8 @@ static int tegra_vde_probe(struct platform_device *pdev) >> * power-cycle it in order to put hardware into a predictable lower >> * power state. >> */ >> - if (pm_runtime_resume_and_get(dev) < 0) >> + err = pm_runtime_resume_and_get(dev); >> + if (err < 0) >> goto err_pm_runtime; >> >> pm_runtime_put(dev); >> > > pm_runtime_resume_and_get() doesn't return positive values, the previous > variant was okay. > > You should also version your patches and add changelog. > Ah, sorry. The other patch is from Yang Yingliang.
> 24.05.2021 16:27, Dmitry Osipenko пишет: >> 24.05.2021 16:35, Wei Yongjun пишет: >>> Fix to return a negative error code from the error handling >>> case instead of 0, as done elsewhere in this function. >>> >>> Fixes: dc8276b78917 ("staging: media: tegra-vde: use pm_runtime_resume_and_get()") >>> Reported-by: Hulk Robot <hulkci@huawei.com> >>> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> >>> --- >>> drivers/staging/media/tegra-vde/vde.c | 3 ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/tegra-vde/vde.c >>> index e025b69776f2..321d14ba2e56 100644 >>> --- a/drivers/staging/media/tegra-vde/vde.c >>> +++ b/drivers/staging/media/tegra-vde/vde.c >>> @@ -1071,7 +1071,8 @@ static int tegra_vde_probe(struct platform_device *pdev) >>> * power-cycle it in order to put hardware into a predictable lower >>> * power state. >>> */ >>> - if (pm_runtime_resume_and_get(dev) < 0) >>> + err = pm_runtime_resume_and_get(dev); >>> + if (err < 0) >>> goto err_pm_runtime; >>> >>> pm_runtime_put(dev); >>> >> pm_runtime_resume_and_get() doesn't return positive values, the previous >> variant was okay. >> >> You should also version your patches and add changelog. >> > Ah, sorry. The other patch is from Yang Yingliang. Sorry, it is my bad. I missed that patch. Regards, Wei Yongjun
diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/tegra-vde/vde.c index e025b69776f2..321d14ba2e56 100644 --- a/drivers/staging/media/tegra-vde/vde.c +++ b/drivers/staging/media/tegra-vde/vde.c @@ -1071,7 +1071,8 @@ static int tegra_vde_probe(struct platform_device *pdev) * power-cycle it in order to put hardware into a predictable lower * power state. */ - if (pm_runtime_resume_and_get(dev) < 0) + err = pm_runtime_resume_and_get(dev); + if (err < 0) goto err_pm_runtime; pm_runtime_put(dev);
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: dc8276b78917 ("staging: media: tegra-vde: use pm_runtime_resume_and_get()") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/staging/media/tegra-vde/vde.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)