diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-11-01 18:06:28 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-11-18 14:38:54 +1000 |
| commit | dd661e5f4e87609e7a9b4cbdff305dca7f494e7b (patch) | |
| tree | 4b673a2329a5c8dd5a8fc828982119a0d2e2928f /drivers/gpu/drm | |
| parent | b54262f3c828ee17e27632d0d60255281c02e1a5 (diff) | |
| download | op-kernel-dev-dd661e5f4e87609e7a9b4cbdff305dca7f494e7b.zip op-kernel-dev-dd661e5f4e87609e7a9b4cbdff305dca7f494e7b.tar.gz | |
drm/nouveau: Return error from nouveau_gpuobj_new if we're out of RAMIN.
Reported-by: Tomas Miljenovic <tomasmiljenovic@gmail.com>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c index 896cf86..dd572ad 100644 --- 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); |
