diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2017-04-12 00:31:16 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-21 09:32:37 +0200 |
| commit | e97e515b744857377b328d7aaa1a7278343b0bd7 (patch) | |
| tree | f1092936c9627bc838418324ac4b289f7a14e2ab | |
| parent | 3287a46c7829c7c949862bc926cb8dda6756d6a1 (diff) | |
| download | linux-stable-e97e515b744857377b328d7aaa1a7278343b0bd7.tar.gz linux-stable-e97e515b744857377b328d7aaa1a7278343b0bd7.tar.bz2 linux-stable-e97e515b744857377b328d7aaa1a7278343b0bd7.zip | |
drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit()
commit 45abdf35cf82e4270328c7237e7812de960ac560 upstream.
Add the missing unlock before return from function etnaviv_gpu_submit()
in the error handling case.
lst: fixed label name.
Fixes: f3cd1b064f11 ("drm/etnaviv: (re-)protect fence allocation with GPU mutex")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index db0a43a090d0..34ffe6e1f6d0 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1309,7 +1309,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, if (!fence) { event_free(gpu, event); ret = -ENOMEM; - goto out_pm_put; + goto out_unlock; } gpu->event[event].fence = fence; @@ -1349,6 +1349,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, hangcheck_timer_reset(gpu); ret = 0; +out_unlock: mutex_unlock(&gpu->lock); out_pm_put: |