From 3e41be71a2db46b5fd9a22af56c4c9d0908afb05 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 15 Oct 2007 10:24:05 +1000 Subject: [PATCH] --- yaml --- r: 68795 b: refs/heads/master c: bdc3e603cda3433c2ccc2069d28f7f3cd319cfc6 h: refs/heads/master i: 68793: 1a0b1c044c67dcd650889161d536f7aaa1696111 68791: 02c15491cf440046c031d4838eee6bcca494b423 v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/amd-k7-agp.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 4adaef4a2978..f81caacde5a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2721e998ede079db10f65e4b42310f79dc8f135 +refs/heads/master: bdc3e603cda3433c2ccc2069d28f7f3cd319cfc6 diff --git a/trunk/drivers/char/agp/amd-k7-agp.c b/trunk/drivers/char/agp/amd-k7-agp.c index f60bca70d1fb..1405a42585e1 100644 --- a/trunk/drivers/char/agp/amd-k7-agp.c +++ b/trunk/drivers/char/agp/amd-k7-agp.c @@ -100,21 +100,16 @@ static int amd_create_gatt_pages(int nr_tables) for (i = 0; i < nr_tables; i++) { entry = kzalloc(sizeof(struct amd_page_map), GFP_KERNEL); + tables[i] = entry; if (entry == NULL) { - while (i > 0) { - kfree(tables[i-1]); - i--; - } - kfree(tables); retval = -ENOMEM; break; } - tables[i] = entry; retval = amd_create_page_map(entry); if (retval != 0) break; } - amd_irongate_private.num_tables = nr_tables; + amd_irongate_private.num_tables = i; amd_irongate_private.gatt_pages = tables; if (retval != 0)