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

Commit 36cf3b13 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

driver core: platform: remove misleading err_alloc label 



In platform_device_register_full() the err_alloc label is
misleading, we only ever jump to it if the pdev is NULL,
but it then proceeds to free it, which is a no-op.

Remove the label and simply exit the function immediately.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c1ea6ab

drivers/base/platform.c

+1 −3
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ struct platform_device *platform_device_register_full( 


	pdev = platform_device_alloc(pdevinfo->name, pdevinfo->id);

	if (!pdev)

		goto err_alloc;

		return ERR_PTR(-ENOMEM);



	pdev->dev.parent = pdevinfo->parent;

	pdev->dev.fwnode = pdevinfo->fwnode;
@@ -568,8 +568,6 @@ struct platform_device *platform_device_register_full( 
err:

		ACPI_COMPANION_SET(&pdev->dev, NULL);

		kfree(pdev->dev.dma_mask);



err_alloc:

		platform_device_put(pdev);

		return ERR_PTR(ret);

	}