Skip to contentSkip to conversation

drm/gma500: Fix error code in probe()

PATCH In review Dan Carpenter 3 participants 3 messages Sep 27, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/gma500: Fix error code in probe()

The error code is stored in "dev_priv", not "dev". The "dev" pointer isn't initialized yet.

Fixes c2f17e60cbe1 ("drm/gma500: Embed struct drm_device in struct drm_psb_private")
---
 drivers/gpu/drm/gma500/psb_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/gma500/psb_drv.c +1 -1
index 3d036d2a3b29..7a10bb39ef0b 100644
@@ -454,7 +454,7 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	dev_priv = devm_drm_dev_alloc(&pdev->dev, &driver, struct drm_psb_private, dev);
 	if (IS_ERR(dev_priv))
-		return PTR_ERR(dev);
+		return PTR_ERR(dev_priv);
 	dev = &dev_priv->dev;
 
 	pci_set_drvdata(pdev, dev);
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 4 lines · Dan Carpenter

The error code is stored in "dev_priv", not "dev". The "dev" pointer isn't initialized yet.

Hi Dan,
This is already addressed in:
https://patchwork.kernel.org/project/dri-devel/patch/[email protected]/

-Patrik

Quoted 22 lines
Fixes c2f17e60cbe1 ("drm/gma500: Embed struct drm_device in struct drm_psb_private")
---
 drivers/gpu/drm/gma500/psb_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/gma500/psb_drv.c +1 -2
index 3d036d2a3b29..7a10bb39ef0b 100644
@@ -454,7 +454,7 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        dev_priv = devm_drm_dev_alloc(&pdev->dev, &driver, struct drm_psb_private, dev);
        if (IS_ERR(dev_priv))
-               return PTR_ERR(dev);
+               return PTR_ERR(dev_priv);
        dev = &dev_priv->dev;
 
        pci_set_drvdata(pdev, dev);
--

2.20.1

#2 lore raw
In reply to Dan Carpenter

Hi

Am 27.09.21 um 10:16 schrieb Dan Carpenter:

Quoted 5 lines

The error code is stored in "dev_priv", not "dev". The "dev" pointer isn't initialized yet.

Fixes c2f17e60cbe1 ("drm/gma500: Embed struct drm_device in struct drm_psb_private")

Thanks for the patch. There's already a fix for this bug in drm-misc-next. [1]

Best regards
Thomas

[1] https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ebe180d376a5f7b2e534b69d237aa6fab43008ee

Quoted 18 lines
---
  drivers/gpu/drm/gma500/psb_drv.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/gma500/psb_drv.c +1 -1
index 3d036d2a3b29..7a10bb39ef0b 100644
@@ -454,7 +454,7 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
  	dev_priv = devm_drm_dev_alloc(&pdev->dev, &driver, struct drm_psb_private, dev);
  	if (IS_ERR(dev_priv))
-		return PTR_ERR(dev);
+		return PTR_ERR(dev_priv);
  	dev = &dev_priv->dev;
 
  	pci_set_drvdata(pdev, dev);
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer