summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-12-05 13:43:39 +0300
committerChris Wilson <chris@chris-wilson.co.uk>2010-12-05 13:43:39 +0300
commit5aa7d52aebfc11760bbc5b081ed621227bb77981 (patch)
tree1bb2542ff9f8f58599325a68f3861f80be27bf26 /drivers/char
parent382ab78c0e4866eb9a812e9ba20d0f876d9634d6 (diff)
parentbbf0c6b3620b3872929ef7d3c392ce436889110f (diff)
downloadlinux-5aa7d52aebfc11760bbc5b081ed621227bb77981.tar.xz
Merge branch 'drm-intel-fixes' into drm-intel-next
Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS. Conflicts: drivers/gpu/drm/i915/i915_dma.c include/drm/i915_drm.h
Diffstat (limited to 'drivers/char')
-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 8cf600cdac06..326ca2ef06b5 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -721,8 +721,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;