mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

staging: vc04_services: Fix an error code in vchiq_probe() 

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

Fixes: 187ac53e59 ("staging: vchiq_arm: rework probe and init functions")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2019-03-25 11:56:59 +03:00 committed by Greg Kroah-Hartman
parent b6391ac734
commit 9b9c87cf51
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
View File

@ -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();