From: Dan Carpenter <dan.carpen...@oracle.com>

[ Upstream commit 9b9c87cf51783cbe7140c51472762094033cfeab ]

We need to set "err" on this error path.

Fixes: 187ac53e590c ("staging: vchiq_arm: rework probe and init functions")
Signed-off-by: Dan Carpenter <dan.carpen...@oracle.com>
Acked-by: Stefan Wahren <stefan.wah...@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin (Microsoft) <sas...@kernel.org>
---
 .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c 
b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 804daf83be35..064d0db4c51e 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -3513,6 +3513,7 @@ static int vchiq_probe(struct platform_device *pdev)
        struct device_node *fw_node;
        const struct of_device_id *of_id;
        struct vchiq_drvdata *drvdata;
+       struct device *vchiq_dev;
        int err;
 
        of_id = of_match_node(vchiq_of_match, pdev->dev.of_node);
@@ -3547,9 +3548,12 @@ static int vchiq_probe(struct platform_device *pdev)
                goto failed_platform_init;
        }
 
-       if (IS_ERR(device_create(vchiq_class, &pdev->dev, vchiq_devid,
-                                NULL, "vchiq")))
+       vchiq_dev = device_create(vchiq_class, &pdev->dev, vchiq_devid, NULL,
+                                 "vchiq");
+       if (IS_ERR(vchiq_dev)) {
+               err = PTR_ERR(vchiq_dev);
                goto failed_device_create;
+       }
 
        vchiq_debugfs_init();
 
-- 
2.19.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to