diff options
author | Luca Barbieri <luca@luca-barbieri.com> | 2010-02-20 05:08:56 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-02-25 00:09:13 -0500 |
commit | e32b2c883bfe9b57c660b5db31a62cea96c0c046 (patch) | |
tree | 8fb7bc6daac0a63dcfd33a3b39160d8dfaeeb694 | |
parent | 761c5a69751967f4fe7430eb65b3a0ea92f3b673 (diff) |
drm/nouveau: fix missing spin_unlock in failure path
Found by sparse.
Signed-off-by: Luca Barbieri <luca@luca-barbieri.com>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index fee959c72f40..8265fed528fd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c | |||
@@ -558,11 +558,11 @@ nouveau_gem_pushbuf_reloc_apply(struct drm_device *dev, | |||
558 | 558 | ||
559 | spin_lock(&nvbo->bo.lock); | 559 | spin_lock(&nvbo->bo.lock); |
560 | ret = ttm_bo_wait(&nvbo->bo, false, false, false); | 560 | ret = ttm_bo_wait(&nvbo->bo, false, false, false); |
561 | spin_unlock(&nvbo->bo.lock); | ||
561 | if (ret) { | 562 | if (ret) { |
562 | NV_ERROR(dev, "reloc wait_idle failed: %d\n", ret); | 563 | NV_ERROR(dev, "reloc wait_idle failed: %d\n", ret); |
563 | break; | 564 | break; |
564 | } | 565 | } |
565 | spin_unlock(&nvbo->bo.lock); | ||
566 | 566 | ||
567 | nouveau_bo_wr32(nvbo, r->reloc_bo_offset >> 2, data); | 567 | nouveau_bo_wr32(nvbo, r->reloc_bo_offset >> 2, data); |
568 | } | 568 | } |