Merge branch 'pm-cpuidle'

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / acpi_platform.c

diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index fafec5ddf17f17c326181988cf3f7d3d625c442f..1bde12708f9e112c708bb71ae8d6162af5e367a9 100644 (file)
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -52,7 +52,7 @@ int acpi_create_platform_device(struct acpi_device *adev,
        struct platform_device_info pdevinfo;
        struct resource_list_entry *rentry;
        struct list_head resource_list;
-       struct resource *resources;
+       struct resource *resources = NULL;
        int count;
 
        /* If the ACPI node already has a physical device attached, skip it. */
@@ -61,20 +61,22 @@ int acpi_create_platform_device(struct acpi_device *adev,
 
        INIT_LIST_HEAD(&resource_list);
        count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
-       if (count <= 0)
+       if (count < 0) {
                return 0;
+       } else if (count > 0) {
+               resources = kmalloc(count * sizeof(struct resource),
+                                   GFP_KERNEL);
+               if (!resources) {
+                       dev_err(&adev->dev, "No memory for resources\n");
+                       acpi_dev_free_resource_list(&resource_list);
+                       return -ENOMEM;
+               }
+               count = 0;
+               list_for_each_entry(rentry, &resource_list, node)
+                       resources[count++] = rentry->res;
 
-       resources = kmalloc(count * sizeof(struct resource), GFP_KERNEL);
-       if (!resources) {
-               dev_err(&adev->dev, "No memory for resources\n");
                acpi_dev_free_resource_list(&resource_list);
-               return -ENOMEM;
        }
-       count = 0;
-       list_for_each_entry(rentry, &resource_list, node)
-               resources[count++] = rentry->res;
-
-       acpi_dev_free_resource_list(&resource_list);
 
        memset(&pdevinfo, 0, sizeof(pdevinfo));
        /*