diff options
| author | Scott Thompson <postfail at hushmail.com> | 2007-08-25 18:14:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-08-25 18:14:00 +1000 |
| commit | 5bdbc7dc2c07d507b41bffdadc2c8cc13b2d4326 (patch) | |
| tree | 028f10ec31f041f97934c3fd6b66eabb81444ed8 /drivers/char/agp/intel-agp.c | |
| parent | 32ddef98f232585f20bc8bdb891029a6a5f633d0 (diff) | |
| download | blackbird-op-linux-5bdbc7dc2c07d507b41bffdadc2c8cc13b2d4326.tar.gz blackbird-op-linux-5bdbc7dc2c07d507b41bffdadc2c8cc13b2d4326.zip | |
agp: balance ioremap checks
patchset against 2.6.23-rc3.
corrects missing ioremap return checks and balancing on iounmap calls, integrated changes per list
recommendations on the original set of patches..
Signed-off-by: Scott Thompson <postfail <at> hushmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/agp/intel-agp.c')
| -rw-r--r-- | drivers/char/agp/intel-agp.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 294cdbf4d44d..2c9ca2c64628 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -930,8 +930,10 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge) temp &= 0xfff80000; intel_private.registers = ioremap(temp,128 * 4096); - if (!intel_private.registers) + if (!intel_private.registers) { + iounmap(intel_private.gtt); return -ENOMEM; + } temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000; global_cache_flush(); /* FIXME: ? */ @@ -985,13 +987,15 @@ static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge) temp &= 0xfff00000; intel_private.gtt = ioremap((temp + (512 * 1024)) , 512 * 1024); - if (!intel_private.gtt) - return -ENOMEM; + if (!intel_private.gtt) + return -ENOMEM; intel_private.registers = ioremap(temp,128 * 4096); - if (!intel_private.registers) - return -ENOMEM; + if (!intel_private.registers) { + iounmap(intel_private.gtt); + return -ENOMEM; + } temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000; global_cache_flush(); /* FIXME: ? */ |
