diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-04-27 05:12:56 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2017-05-16 19:09:41 -0400 |
commit | 2579b8b0ece53248b815042f8662a4531acf120d (patch) | |
tree | 85a1b17aea2349391b5f2125c32f9d9de2da14c4 | |
parent | 563ad2b640955a0da21aedce1aaa332c7d016dde (diff) |
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>
-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) | |||
148 | case NVKM_MEM_TARGET_NCOH: target = 3; break; | 148 | case NVKM_MEM_TARGET_NCOH: target = 3; break; |
149 | default: | 149 | default: |
150 | WARN_ON(1); | 150 | WARN_ON(1); |
151 | return; | 151 | goto unlock; |
152 | } | 152 | } |
153 | 153 | ||
154 | nvkm_wr32(device, 0x002270, (nvkm_memory_addr(mem) >> 12) | | 154 | nvkm_wr32(device, 0x002270, (nvkm_memory_addr(mem) >> 12) | |
@@ -160,6 +160,7 @@ gk104_fifo_runlist_commit(struct gk104_fifo *fifo, int runl) | |||
160 | & 0x00100000), | 160 | & 0x00100000), |
161 | msecs_to_jiffies(2000)) == 0) | 161 | msecs_to_jiffies(2000)) == 0) |
162 | nvkm_error(subdev, "runlist %d update timeout\n", runl); | 162 | nvkm_error(subdev, "runlist %d update timeout\n", runl); |
163 | unlock: | ||
163 | mutex_unlock(&subdev->mutex); | 164 | mutex_unlock(&subdev->mutex); |
164 | } | 165 | } |
165 | 166 | ||