mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
media: s5p-mfc: Properly handle dma_parms for the allocated devices
Commit9495b7e92f
("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: Tomi Valkeinen <tomi.valkeinen@ti.com> Suggested-by: Ulf Hansson <ulf.hansson@linaro.org> Fixes:9495b7e92f
("driver core: platform: Initialize dma_parms for platform devices") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
parent
15168b2046
commit
cc8c0363dd
1 changed files with 5 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue