Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 397fcd12 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

staging: vchiq_arm: fix error codes in probe 



If vchiq_debugfs_init() fails, then we accidentally return a valid
pointer casted to int on error.  This code is simpler if we get rid of
the "ptr_err" variable and just use "err" throughout.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15d51931

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+4 −6
Original line number Diff line number Diff line
@@ -3391,7 +3391,6 @@ static int vchiq_probe(struct platform_device *pdev) 
	struct device_node *fw_node;

	struct rpi_firmware *fw;

	int err;

	void *ptr_err;



	fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);

	if (!fw_node) {
@@ -3427,14 +3426,14 @@ static int vchiq_probe(struct platform_device *pdev) 


	/* create sysfs entries */

	vchiq_class = class_create(THIS_MODULE, DEVICE_NAME);

	ptr_err = vchiq_class;

	if (IS_ERR(ptr_err))

	err = PTR_ERR(vchiq_class);

	if (IS_ERR(vchiq_class))

		goto failed_class_create;



	vchiq_dev = device_create(vchiq_class, NULL,

		vchiq_devid, NULL, "vchiq");

	ptr_err = vchiq_dev;

	if (IS_ERR(ptr_err))

	err = PTR_ERR(vchiq_dev);

	if (IS_ERR(vchiq_dev))

		goto failed_device_create;



	/* create debugfs entries */
@@ -3455,7 +3454,6 @@ static int vchiq_probe(struct platform_device *pdev) 
	class_destroy(vchiq_class);

failed_class_create:

	cdev_del(&vchiq_cdev);

	err = PTR_ERR(ptr_err);

failed_cdev_add:

	unregister_chrdev_region(vchiq_devid, 1);

failed_platform_init: