Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7aae622 authored by Dave Airlie's avatar Dave Airlie
Browse files

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()
parents 39da7c50 45abdf35

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+2 −1
Original line number Diff line number Diff line
@@ -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: