summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter2010-04-27 23:11:05 +0200
committerDave Airlie2010-04-28 10:41:51 +0200
commit404b017d00a9f472bdf725a06892d42f1cba5ed8 (patch)
tree51cfdc4dabfe79bab020604ff2813b5714c009e2
parentdrivers/gpu/drm/via/via_video.c: fix off by one issue (diff)
downloadkernel-qcow2-linux-404b017d00a9f472bdf725a06892d42f1cba5ed8.tar.gz
kernel-qcow2-linux-404b017d00a9f472bdf725a06892d42f1cba5ed8.tar.xz
kernel-qcow2-linux-404b017d00a9f472bdf725a06892d42f1cba5ed8.zip
drivers/gpu/drm/drm_memory.c: fix check for end of loop
"agpmem" is never NULL here. Signed-off-by: Dan Carpenter <error27@gmail.com> Cc: Eric Anholt <eric@anholt.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
index e4865f99989c..7732268eced2 100644
--- a/drivers/gpu/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c
@@ -77,7 +77,7 @@ static void *agp_remap(unsigned long offset, unsigned long size,
&& (agpmem->bound + (agpmem->pages << PAGE_SHIFT)) >=
(offset + size))
break;
- if (!agpmem)
+ if (&agpmem->head == &dev->agp->memory)
return NULL;
/*