diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-13 09:11:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-13 09:11:24 +1000 |
| commit | c7aae6221f73312bb66464c353eb45d91433aea1 (patch) | |
| tree | 21e2f86ec4234724d2755d5b184a5a5d4571fc2d /drivers | |
| parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
| parent | 45abdf35cf82e4270328c7237e7812de960ac560 (diff) | |
| download | linux-c7aae6221f73312bb66464c353eb45d91433aea1.tar.bz2 | |
Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes
Single etnaviv error path fix.
* 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux:
drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit()
Diffstat (limited to 'drivers')
| -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 da48819ff2e6..b78d9239e48f 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1317,7 +1317,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; @@ -1357,6 +1357,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, hangcheck_timer_reset(gpu); ret = 0; +out_unlock: mutex_unlock(&gpu->lock); out_pm_put: |