1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 871aa520ece7..0a1863ec91f3 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -96,11 +96,10 @@ static int acpi_container_add(struct acpi_device *device)
                 return -EINVAL;
         }
 
-        container = kmalloc(sizeof(struct acpi_container), GFP_KERNEL);
+        container = kzalloc(sizeof(struct acpi_container), GFP_KERNEL);
         if (!container)
                 return -ENOMEM;
 
-        memset(container, 0, sizeof(struct acpi_container));
         container->handle = device->handle;
         strcpy(acpi_device_name(device), ACPI_CONTAINER_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_CONTAINER_CLASS);
@@ -117,7 +116,7 @@ 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);
+        pc = acpi_driver_data(device);
         kfree(pc);
         return status;
 }