diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-09-06 16:57:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-09-06 16:58:10 +1000 |
| commit | 9a60b2990d6c2b7ab935fe0a5cc274de67d98bed (patch) | |
| tree | 92b285d90fd9cd2b47ac544ade4db20464aa268b /drivers | |
| parent | 9ed45a209a9e53fd0e787594ead73f881fc751e4 (diff) | |
| parent | dbcc574a4bfad810ce6e118f3cf327c7b6e7c897 (diff) | |
| download | linux-stable-9a60b2990d6c2b7ab935fe0a5cc274de67d98bed.tar.gz linux-stable-9a60b2990d6c2b7ab935fe0a5cc274de67d98bed.tar.bz2 linux-stable-9a60b2990d6c2b7ab935fe0a5cc274de67d98bed.zip | |
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next
single etnaviv fix for an error path.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/4ae00cfb47c8e6fffca5dbb45ae9370cd4e5eaf4.camel@pengutronix.de
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c index aac8dbf3ea56..1a7c89a67bea 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c @@ -140,8 +140,10 @@ etnaviv_iommuv1_context_alloc(struct etnaviv_iommu_global *global) } v1_context = kzalloc(sizeof(*v1_context), GFP_KERNEL); - if (!v1_context) + if (!v1_context) { + mutex_unlock(&global->lock); return NULL; + } v1_context->pgtable_cpu = dma_alloc_wc(global->dev, PT_SIZE, &v1_context->pgtable_dma, |