From: Petr Vandrovec <vandrove@vc.cvut.cz>
Date: Fri, 5 Jul 2002 09:27:11 +0000 (-0700)
Subject: [PATCH] drivers/ide/probe.c leaks memory
X-Git-Tag: v2.5.25~1
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=3bb19dd45df33ceb842019c939d4445dac1d8220;p=history.git

[PATCH] drivers/ide/probe.c leaks memory

  drivers/ide/probe.c initializes gd->de_arr and gd->flags twice. Except that
it is unnecessary it also leaks memory.
---

diff --git a/drivers/ide/probe.c b/drivers/ide/probe.c
index b1b026f76cfc..ab7df11e44a7 100644
--- a/drivers/ide/probe.c
+++ b/drivers/ide/probe.c
@@ -1173,18 +1173,6 @@ static void channel_init(struct ata_channel *ch)
 	gd->next	= NULL;			/* linked list of major devs */
 	gd->fops        = ide_fops;             /* file operations */
 
-	gd->de_arr	= kmalloc(sizeof(*gd->de_arr) * MAX_DRIVES, GFP_KERNEL);
-	if (gd->de_arr)
-		memset(gd->de_arr, 0, sizeof(*gd->de_arr) * MAX_DRIVES);
-	else
-	    goto err_kmalloc_gd_de_arr;
-
-	gd->flags	= kmalloc(sizeof(*gd->flags) * MAX_DRIVES, GFP_KERNEL);
-	if (gd->flags)
-		memset(gd->flags, 0, sizeof(*gd->flags) * MAX_DRIVES);
-	else
-	    goto err_kmalloc_gd_flags;
-
 	ch->gd = gd;
 	add_gendisk(gd);