1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 780e59e588ad..2d46b713c8f2 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -123,21 +123,16 @@ static int ati_create_gatt_pages(int nr_tables)
 
         for (i = 0; i < nr_tables; i++) {
                 entry = kzalloc(sizeof(struct ati_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 = ati_create_page_map(entry);
                 if (retval != 0)
                         break;
         }
-        ati_generic_private.num_tables = nr_tables;
+        ati_generic_private.num_tables = i;
         ati_generic_private.gatt_pages = tables;
 
         if (retval != 0)
@@ -218,6 +213,9 @@ static int ati_configure(void)
         temp = (temp & 0xfffff000);
         ati_generic_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
 
+        if (!ati_generic_private.registers)
+                return -ENOMEM;
+
         if (is_r200())
                 pci_write_config_dword(agp_bridge->dev, ATI_RS100_IG_AGPMODE, 0x20000);
         else