diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-10-11 20:11:00 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-03 00:05:27 -0500 |
commit | 18a16a768c3d37f5bfdbb414217b530294d5d442 (patch) | |
tree | 70574a519558bdd78a93acb06e0cd51296085c18 /drivers/gpu/drm/nouveau/nouveau_ramht.c | |
parent | 938c40ed69b2c1eceb72247b5e8975b28afc195f (diff) |
drm/nouveau: return error from nouveau_ramht_remove() if not found
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_ramht.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ramht.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_ramht.c b/drivers/gpu/drm/nouveau/nouveau_ramht.c index 2d8580927ca4..b4c63c058888 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ramht.c +++ b/drivers/gpu/drm/nouveau/nouveau_ramht.c | |||
@@ -214,18 +214,19 @@ out: | |||
214 | spin_unlock_irqrestore(&chan->ramht->lock, flags); | 214 | spin_unlock_irqrestore(&chan->ramht->lock, flags); |
215 | } | 215 | } |
216 | 216 | ||
217 | void | 217 | int |
218 | nouveau_ramht_remove(struct nouveau_channel *chan, u32 handle) | 218 | nouveau_ramht_remove(struct nouveau_channel *chan, u32 handle) |
219 | { | 219 | { |
220 | struct nouveau_ramht_entry *entry; | 220 | struct nouveau_ramht_entry *entry; |
221 | 221 | ||
222 | entry = nouveau_ramht_remove_entry(chan, handle); | 222 | entry = nouveau_ramht_remove_entry(chan, handle); |
223 | if (!entry) | 223 | if (!entry) |
224 | return; | 224 | return -ENOENT; |
225 | 225 | ||
226 | nouveau_ramht_remove_hash(chan, entry->handle); | 226 | nouveau_ramht_remove_hash(chan, entry->handle); |
227 | nouveau_gpuobj_ref(NULL, &entry->gpuobj); | 227 | nouveau_gpuobj_ref(NULL, &entry->gpuobj); |
228 | kfree(entry); | 228 | kfree(entry); |
229 | return 0; | ||
229 | } | 230 | } |
230 | 231 | ||
231 | struct nouveau_gpuobj * | 232 | struct nouveau_gpuobj * |