Linux ARM-MSM sub-architecture
 help / color / mirror / Atom feed
* [PATCH] Revert "venus: pm_helpers: Fix error check in vcodec_domains_get()"
@ 2023-07-03 15:30 Dan Carpenter
  2023-07-10  7:29 ` Vikash Garodia
  0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2023-07-03 15:30 UTC (permalink / raw)
  To: Tang Bin, Stanimir Varbanov
  Cc: Vikash Garodia, Bryan O'Donoghue, Andy Gross, Bjorn Andersson,
	Konrad Dybcio, Mauro Carvalho Chehab, linux-media, linux-arm-msm

This reverts commit 0f6e8d8c94a82e85e1b9b62a7671990740dc6f70.

The reverted commit was based on static analysis and a misunderstanding
of how PTR_ERR() and NULLs are supposed to work.  When a function
returns both pointer errors and NULL then normally the NULL means
"continue operating without a feature because it was deliberately
turned off".  The NULL should not be treated as a failure.  If a driver
cannot work when that feature is disabled then the KConfig should
enforce that the function cannot return NULL.  We should not need to
test for it.

In this code, the patch breaks the venus driver if CONFIG_PM is
disabled.

Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
This patch is also based on static analysis and review so probably best
to be cautious.  My guess is that very few people disable CONFIG_PM
these days so that's why the bug wasn't caught.

 drivers/media/platform/qcom/venus/pm_helpers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c
index 48c9084bb4db..c93d2906e4c7 100644
--- a/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@ -869,8 +869,8 @@ static int vcodec_domains_get(struct venus_core *core)
 	for (i = 0; i < res->vcodec_pmdomains_num; i++) {
 		pd = dev_pm_domain_attach_by_name(dev,
 						  res->vcodec_pmdomains[i]);
-		if (IS_ERR_OR_NULL(pd))
-			return PTR_ERR(pd) ? : -ENODATA;
+		if (IS_ERR(pd))
+			return PTR_ERR(pd);
 		core->pmdomains[i] = pd;
 	}
 
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-07-10  9:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-03 15:30 [PATCH] Revert "venus: pm_helpers: Fix error check in vcodec_domains_get()" Dan Carpenter
2023-07-10  7:29 ` Vikash Garodia
2023-07-10  8:03   ` Dan Carpenter
2023-07-10  8:18     ` Vikash Garodia
2023-07-10  8:30       ` Dan Carpenter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox