summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/intel-gtt.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-18 00:14:02 +0100
committerTony Lindgren <tony@atomide.com>2010-12-18 00:14:02 +0100
commitfea83f6a9b0a90fefca16ac3534e308f6c34144b (patch)
tree3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /drivers/char/agp/intel-gtt.c
parentomap: Fix setting omap_irq_base for 2430 (diff)
parentarm: omap: add minimal support for RM-680 (diff)
downloadlinux-fea83f6a9b0a90fefca16ac3534e308f6c34144b.tar.xz
linux-fea83f6a9b0a90fefca16ac3534e308f6c34144b.zip
Merge branch 'devel-board' into omap-for-linus
Diffstat (limited to 'drivers/char/agp/intel-gtt.c')
-rw-r--r--drivers/char/agp/intel-gtt.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 9272c38dd3c6..16a2847b7cdb 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -812,8 +812,10 @@ static int intel_fake_agp_fetch_size(void)
static void i830_cleanup(void)
{
- kunmap(intel_private.i8xx_page);
- intel_private.i8xx_flush_page = NULL;
+ if (intel_private.i8xx_flush_page) {
+ kunmap(intel_private.i8xx_flush_page);
+ intel_private.i8xx_flush_page = NULL;
+ }
__free_page(intel_private.i8xx_page);
intel_private.i8xx_page = NULL;