1 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index 966fa1062491..66a27d268d9a 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1845,7 +1845,7 @@ static struct sysdev_class ioapic_sysdev_class = {
 static int __init ioapic_init_sysfs(void)
 {
         struct sys_device * dev;
-        int i, size, error = 0;
+        int i, size, error;
 
         error = sysdev_class_register(&ioapic_sysdev_class);
         if (error)
@@ -1854,12 +1854,11 @@ static int __init ioapic_init_sysfs(void)
         for (i = 0; i < nr_ioapics; i++ ) {
                 size = sizeof(struct sys_device) + nr_ioapic_registers[i]
                         * sizeof(struct IO_APIC_route_entry);
-                mp_ioapic_data[i] = kmalloc(size, GFP_KERNEL);
+                mp_ioapic_data[i] = kzalloc(size, GFP_KERNEL);
                 if (!mp_ioapic_data[i]) {
                         printk(KERN_ERR "Can't suspend/resume IOAPIC %d\n", i);
                         continue;
                 }
-                memset(mp_ioapic_data[i], 0, size);
                 dev = &mp_ioapic_data[i]->dev;
                 dev->id = i;
                 dev->cls = &ioapic_sysdev_class;