diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/dma/stm32-mdma.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3e5a5d263f29..bfb15573465f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2356,7 +2356,7 @@ F: arch/arm/mm/cache-uniphier.c | |||
| 2356 | F: arch/arm64/boot/dts/socionext/uniphier* | 2356 | F: arch/arm64/boot/dts/socionext/uniphier* |
| 2357 | F: drivers/bus/uniphier-system-bus.c | 2357 | F: drivers/bus/uniphier-system-bus.c |
| 2358 | F: drivers/clk/uniphier/ | 2358 | F: drivers/clk/uniphier/ |
| 2359 | F: drivers/dmaengine/uniphier-mdmac.c | 2359 | F: drivers/dma/uniphier-mdmac.c |
| 2360 | F: drivers/gpio/gpio-uniphier.c | 2360 | F: drivers/gpio/gpio-uniphier.c |
| 2361 | F: drivers/i2c/busses/i2c-uniphier* | 2361 | F: drivers/i2c/busses/i2c-uniphier* |
| 2362 | F: drivers/irqchip/irq-uniphier-aidet.c | 2362 | F: drivers/irqchip/irq-uniphier-aidet.c |
diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c index 4e0eede599a8..ac0301b69593 100644 --- a/drivers/dma/stm32-mdma.c +++ b/drivers/dma/stm32-mdma.c | |||
| @@ -1578,11 +1578,9 @@ static int stm32_mdma_probe(struct platform_device *pdev) | |||
| 1578 | 1578 | ||
| 1579 | dmadev->nr_channels = nr_channels; | 1579 | dmadev->nr_channels = nr_channels; |
| 1580 | dmadev->nr_requests = nr_requests; | 1580 | dmadev->nr_requests = nr_requests; |
| 1581 | ret = device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks", | 1581 | device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks", |
| 1582 | dmadev->ahb_addr_masks, | 1582 | dmadev->ahb_addr_masks, |
| 1583 | count); | 1583 | count); |
| 1584 | if (ret) | ||
| 1585 | return ret; | ||
| 1586 | dmadev->nr_ahb_addr_masks = count; | 1584 | dmadev->nr_ahb_addr_masks = count; |
| 1587 | 1585 | ||
| 1588 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1586 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
