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 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_object.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_object.c
b/drivers/gpu/drm/nouveau/nouveau_object.c
index
896cf86
..
dd572ad
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_object.c
@@
-129,7
+129,7
@@
nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
if (ramin == NULL) {
spin_unlock(&dev_priv->ramin_lock);
nouveau_gpuobj_ref(NULL, &gpuobj);
- return
ret
;
+ return
-ENOMEM
;
}
ramin = drm_mm_get_block_atomic(ramin, size, align);