1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index c6db591479de..31218e1d2a18 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -28,8 +28,7 @@ static int acpi_bus_trim(struct acpi_device *start, int rmdevice);
 static void acpi_device_release(struct kobject *kobj)
 {
         struct acpi_device *dev = container_of(kobj, struct acpi_device, kobj);
-        if (dev->pnp.cid_list)
-                kfree(dev->pnp.cid_list);
+        kfree(dev->pnp.cid_list);
         kfree(dev);
 }
 
@@ -1111,14 +1110,13 @@ acpi_add_single_object(struct acpi_device **child,
          *
          * TBD: Assumes LDM provides driver hot-plug capability.
          */
-        result = acpi_bus_find_driver(device);
+        acpi_bus_find_driver(device);
 
       end:
         if (!result)
                 *child = device;
         else {
-                if (device->pnp.cid_list)
-                        kfree(device->pnp.cid_list);
+                kfree(device->pnp.cid_list);
                 kfree(device);
         }