Skip to contentSkip to conversation

media: rockchip: rga: Fix probe rga_parse_dt bugs

PATCH Superseded Jarrah Gosbell 2 participants 3 messages Aug 14, 2022

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: rockchip: rga: Fix probe rga_parse_dt bugs

From: Ondrej Jirman <[email protected]>

rga_parse_dt is missing a error return, so if some of the resources return DEFER_PROBE, probe will succeed without these resources.

---
 drivers/media/platform/rockchip/rga/rga.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/rockchip/rga/rga.c +3 -1
index 2f8df74ad0fd..b88dd7ed2036 100644
@@ -815,8 +815,10 @@ static int rga_probe(struct platform_device *pdev)
 	mutex_init(&rga->mutex);
 
 	ret = rga_parse_dt(rga);
-	if (ret)
+	if (ret) {
 		dev_err(&pdev->dev, "Unable to parse OF data\n");
+		return ret;
+	}
 
 	pm_runtime_enable(rga->dev);
 
Signature · 1 line
2.35.1
#1 lore raw
Quoted 17 lines · Jarrah Gosbell

From: Ondrej Jirman <[email protected]>

rga_parse_dt is missing a error return, so if some of the resources return DEFER_PROBE, probe will succeed without these resources.

---
 drivers/media/platform/rockchip/rga/rga.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/rockchip/rga/rga.c +0 -0
index 2f8df74ad0fd..b88dd7ed2036 100644

drivers/media/platform/rockchip/rga/rga.c static int rga_probe(struct platform_device *pdev) · line 819

Quoted 6 lines
drivers/media/platform/rockchip/rga/rga.c +1 -1
@@ -815,8 +815,10 @@ static int rga_probe(struct platform_device *pdev)
        mutex_init(&rga->mutex);
 
        ret = rga_parse_dt(rga);
-       if (ret)
+       if (ret) {
                dev_err(&pdev->dev, "Unable to parse OF data\n");

If this can return EPROBE_DEFER, shouldn't this be dev_err_probe instead of dev_err?

Quoted 13 lines
drivers/media/platform/rockchip/rga/rga.c +2 -1
+               return ret;
+       }
 
        pm_runtime_enable(rga->dev);
 
--

2.35.1

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#2 lore raw
Quoted 6 lines · Peter Geis

drivers/media/platform/rockchip/rga/rga.c static int rga_probe(struct platform_device *pdev) · line 819

Quoted 4 lines
         ret = rga_parse_dt(rga);
drivers/media/platform/rockchip/rga/rga.c +1 -1
-       if (ret)
+       if (ret) {
                 dev_err(&pdev->dev, "Unable to parse OF data\n");

If this can return EPROBE_DEFER, shouldn't this be dev_err_probe instead of dev_err?

Looking into it that does make more sense. I suspect it wasn't done this way originally because dev_err_probe isn't used elsewhere in rga.c. I'll send a v2 with that change shortly.

Thanks for the review.

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip