UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <johannes.berg@intel.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johannes Berg 2019-03-01 13:24:47 +01:00 committed by Greg Kroah-Hartman
parent 2c1ea6abde
commit 36cf3b1363
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/base/platform.c
View File

@ -521,7 +521,7 @@ struct platform_device *platform_device_register_full(
pdev = platform_device_alloc(pdevinfo->name, pdevinfo->id); pdev = platform_device_alloc(pdevinfo->name, pdevinfo->id);
if (!pdev) if (!pdev)
goto err_alloc; return ERR_PTR(-ENOMEM);
pdev->dev.parent = pdevinfo->parent; pdev->dev.parent = pdevinfo->parent;
pdev->dev.fwnode = pdevinfo->fwnode; pdev->dev.fwnode = pdevinfo->fwnode;
@ -568,8 +568,6 @@ struct platform_device *platform_device_register_full(
err: err:
ACPI_COMPANION_SET(&pdev->dev, NULL); ACPI_COMPANION_SET(&pdev->dev, NULL);
kfree(pdev->dev.dma_mask); kfree(pdev->dev.dma_mask);
err_alloc:
platform_device_put(pdev); platform_device_put(pdev);
return ERR_PTR(ret); return ERR_PTR(ret);
} }