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: Johannes Berg <[email protected]>
Reviewed-by: Rafael J. Wysocki <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index fc67a325beaab774bf21992a6e0ae7ae1acca306..4e45ac21d672140348d474ec7a5a29a8851a2109 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -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);
        }