diff options
| author | Dan Carpenter | 2017-04-27 11:12:56 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2017-05-17 01:09:41 +0200 |
| commit | 2579b8b0ece53248b815042f8662a4531acf120d (patch) | |
| tree | 85a1b17aea2349391b5f2125c32f9d9de2da14c4 /drivers/gpu | |
| parent | drm/nouveau/secboot: plug memory leak in ls_ucode_img_load_gr() error path (diff) | |
| download | kernel-qcow2-linux-2579b8b0ece53248b815042f8662a4531acf120d.tar.gz kernel-qcow2-linux-2579b8b0ece53248b815042f8662a4531acf120d.tar.xz kernel-qcow2-linux-2579b8b0ece53248b815042f8662a4531acf120d.zip | |
drm/nouveau/fifo/gk104-: Silence a locking warning
Presumably we can never actually hit this return, but static checkers
complain that we should unlock before we return.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c index 3a24788c3185..a7e55c422501 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c @@ -148,7 +148,7 @@ gk104_fifo_runlist_commit(struct gk104_fifo *fifo, int runl) case NVKM_MEM_TARGET_NCOH: target = 3; break; default: WARN_ON(1); - return; + goto unlock; } nvkm_wr32(device, 0x002270, (nvkm_memory_addr(mem) >> 12) | @@ -160,6 +160,7 @@ gk104_fifo_runlist_commit(struct gk104_fifo *fifo, int runl) & 0x00100000), msecs_to_jiffies(2000)) == 0) nvkm_error(subdev, "runlist %d update timeout\n", runl); +unlock: mutex_unlock(&subdev->mutex); } |