git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
drm_memory.c
diff --git
a/drivers/gpu/drm/drm_memory.c
b/drivers/gpu/drm/drm_memory.c
index
e4865f9
..
7732268
100644
(file)
--- 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;
/*