1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 9344216183a4..f97122a53ca3 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -797,6 +797,10 @@ static int intel_i830_create_gatt_table(struct agp_bridge_data *bridge)
 
         /* we have to call this as early as possible after the MMIO base address is known */
         intel_i830_init_gtt_entries();
+        if (intel_private.gtt_entries == 0) {
+                iounmap(intel_private.registers);
+                return -ENOMEM;
+        }
 
         agp_bridge->gatt_table = NULL;
 
@@ -1279,6 +1283,11 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
 
         /* we have to call this as early as possible after the MMIO base address is known */
         intel_i830_init_gtt_entries();
+        if (intel_private.gtt_entries == 0) {
+                iounmap(intel_private.gtt);
+                iounmap(intel_private.registers);
+                return -ENOMEM;
+        }
 
         agp_bridge->gatt_table = NULL;
 
@@ -1387,6 +1396,11 @@ static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge)
 
         /* we have to call this as early as possible after the MMIO base address is known */
         intel_i830_init_gtt_entries();
+        if (intel_private.gtt_entries == 0) {
+                iounmap(intel_private.gtt);
+                iounmap(intel_private.registers);
+                return -ENOMEM;
+        }
 
         agp_bridge->gatt_table = NULL;