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
This commit is contained in:
commit
9a60b2990d
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user