1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 73ca8f73917d..9fe19808d815 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -864,9 +864,8 @@ static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int r
         down(&ide_setting_sem);
         while ((*p) && strcmp((*p)->name, name) < 0)
                 p = &((*p)->next);
-        if ((setting = kmalloc(sizeof(*setting), GFP_KERNEL)) == NULL)
+        if ((setting = kzalloc(sizeof(*setting), GFP_KERNEL)) == NULL)
                 goto abort;
-        memset(setting, 0, sizeof(*setting));
         if ((setting->name = kmalloc(strlen(name) + 1, GFP_KERNEL)) == NULL)
                 goto abort;
         strcpy(setting->name, name);
@@ -889,8 +888,7 @@ static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int r
         return 0;
 abort:
         up(&ide_setting_sem);
-        if (setting)
-                kfree(setting);
+        kfree(setting);
         return -1;
 }