1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index f47c78a10656..5f43e0d14899 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -160,12 +160,11 @@ acpi_battery_get_info(struct acpi_battery *battery,
                 goto end;
         }
 
-        data.pointer = kmalloc(data.length, GFP_KERNEL);
+        data.pointer = kzalloc(data.length, GFP_KERNEL);
         if (!data.pointer) {
                 result = -ENOMEM;
                 goto end;
         }
-        memset(data.pointer, 0, data.length);
 
         status = acpi_extract_package(package, &format, &data);
         if (ACPI_FAILURE(status)) {
@@ -220,12 +219,11 @@ acpi_battery_get_status(struct acpi_battery *battery,
                 goto end;
         }
 
-        data.pointer = kmalloc(data.length, GFP_KERNEL);
+        data.pointer = kzalloc(data.length, GFP_KERNEL);
         if (!data.pointer) {
                 result = -ENOMEM;
                 goto end;
         }
-        memset(data.pointer, 0, data.length);
 
         status = acpi_extract_package(package, &format, &data);
         if (ACPI_FAILURE(status)) {
@@ -694,10 +692,9 @@ static int acpi_battery_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        battery = kmalloc(sizeof(struct acpi_battery), GFP_KERNEL);
+        battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
         if (!battery)
                 return -ENOMEM;
-        memset(battery, 0, sizeof(struct acpi_battery));
 
         battery->device = device;
         strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);