Commit cc8c0363 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab

media: s5p-mfc: Properly handle dma_parms for the allocated devices

Commit 9495b7e9 ("driver core: platform: Initialize dma_parms for
platform devices") in v5.7-rc5 added allocation of dma_parms structure to
all platform devices. Then vb2_dma_contig_set_max_seg_size() have been
changed not to allocate dma_parms structure and rely on the one allocated
by the device core. Lets allocate the needed structure also for the
devices created for the 2 MFC device memory ports.
Reported-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Suggested-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Fixes: 9495b7e9 ("driver core: platform: Initialize dma_parms for platform devices")
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 15168b20
......@@ -1089,6 +1089,10 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev,
child->coherent_dma_mask = dev->coherent_dma_mask;
child->dma_mask = dev->dma_mask;
child->release = s5p_mfc_memdev_release;
child->dma_parms = devm_kzalloc(dev, sizeof(*child->dma_parms),
GFP_KERNEL);
if (!child->dma_parms)
goto err;
/*
* The memdevs are not proper OF platform devices, so in order for them
......@@ -1104,7 +1108,7 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev,
return child;
device_del(child);
}
err:
put_device(child);
return NULL;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment