Merge branch 'master'

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 10dd695a1dd9..27ec12c1fab0 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -118,11 +118,9 @@ static int acpi_container_remove(struct acpi_device *device, int type)
 {
         acpi_status status = AE_OK;
         struct acpi_container *pc = NULL;
-        pc = (struct acpi_container *)acpi_driver_data(device);
-
-        if (pc)
-                kfree(pc);
 
+        pc = (struct acpi_container *)acpi_driver_data(device);
+        kfree(pc);
         return status;
 }