aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/asus_acpi.c
diff options
context:
space:
mode:
authorBurman Yan <yan_952@hotmail.com>2006-12-19 15:56:11 -0500
committerLen Brown <len.brown@intel.com>2006-12-20 16:54:54 -0500
commit36bcbec7ce21e2e8b3143b11a05747330abeca70 (patch)
treed9ace4d83a5013dbb3cd599e7bc4358ce4cdb980 /drivers/acpi/asus_acpi.c
parent5b7b4119553dd7cc0bc200c0d1b1598e158eec9a (diff)
ACPI: replace kmalloc+memset with kzalloc
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/asus_acpi.c')
-rw-r--r--drivers/acpi/asus_acpi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 7cc54aacd4c0..396140bbbe57 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1264,10 +1264,9 @@ static int asus_hotk_add(struct acpi_device *device)
1264 printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n", 1264 printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
1265 ASUS_ACPI_VERSION); 1265 ASUS_ACPI_VERSION);
1266 1266
1267 hotk = kmalloc(sizeof(struct asus_hotk), GFP_KERNEL); 1267 hotk = kzalloc(sizeof(struct asus_hotk), GFP_KERNEL);
1268 if (!hotk) 1268 if (!hotk)
1269 return -ENOMEM; 1269 return -ENOMEM;
1270 memset(hotk, 0, sizeof(struct asus_hotk));
1271 1270
1272 hotk->handle = device->handle; 1271 hotk->handle = device->handle;
1273 strcpy(acpi_device_name(device), ACPI_HOTK_DEVICE_NAME); 1272 strcpy(acpi_device_name(device), ACPI_HOTK_DEVICE_NAME);