projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dmaengine-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...
[platform/kernel/linux-rpi.git]
/
drivers
/
dma
/
mcf-edma-main.c
diff --git
a/drivers/dma/mcf-edma-main.c
b/drivers/dma/mcf-edma-main.c
index
a903461
..
b359421
100644
(file)
--- a/
drivers/dma/mcf-edma-main.c
+++ b/
drivers/dma/mcf-edma-main.c
@@
-163,7
+163,13
@@
static int mcf_edma_probe(struct platform_device *pdev)
return -EINVAL;
}
return -EINVAL;
}
- chans = pdata->dma_channels;
+ if (!pdata->dma_channels) {
+ dev_info(&pdev->dev, "setting default channel number to 64");
+ chans = 64;
+ } else {
+ chans = pdata->dma_channels;
+ }
+
mcf_edma = devm_kzalloc(&pdev->dev, struct_size(mcf_edma, chans, chans),
GFP_KERNEL);
if (!mcf_edma)
mcf_edma = devm_kzalloc(&pdev->dev, struct_size(mcf_edma, chans, chans),
GFP_KERNEL);
if (!mcf_edma)
@@
-175,11
+181,6
@@
static int mcf_edma_probe(struct platform_device *pdev)
mcf_edma->drvdata = &mcf_data;
mcf_edma->big_endian = 1;
mcf_edma->drvdata = &mcf_data;
mcf_edma->big_endian = 1;
- if (!mcf_edma->n_chans) {
- dev_info(&pdev->dev, "setting default channel number to 64");
- mcf_edma->n_chans = 64;
- }
-
mutex_init(&mcf_edma->fsl_edma_mutex);
mcf_edma->membase = devm_platform_ioremap_resource(pdev, 0);
mutex_init(&mcf_edma->fsl_edma_mutex);
mcf_edma->membase = devm_platform_ioremap_resource(pdev, 0);