Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'dmaengine-fix-5.1-rc3' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
- Revert "dmaengine: stm32-mdma: Add a check on read_u32_array" as that
caused regression
- Fix MAINTAINER file uniphier-mdmac.c file path
* tag 'dmaengine-fix-5.1-rc3' of git://git.infradead.org/users/vkoul/slave-dma:
MAINTAINERS: Fix uniphier-mdmac.c file path
dmaengine: stm32-mdma: Revert "dmaengine: stm32-mdma: Add a check on read_u32_array"
+2
-4
+1
-1
MAINTAINERS
+1
-1
MAINTAINERS
···
2356
2356
F: arch/arm64/boot/dts/socionext/uniphier*
2357
2357
F: drivers/bus/uniphier-system-bus.c
2358
2358
F: drivers/clk/uniphier/
2359
-
F: drivers/dmaengine/uniphier-mdmac.c
2359
+
F: drivers/dma/uniphier-mdmac.c
2360
2360
F: drivers/gpio/gpio-uniphier.c
2361
2361
F: drivers/i2c/busses/i2c-uniphier*
2362
2362
F: drivers/irqchip/irq-uniphier-aidet.c
+1
-3
drivers/dma/stm32-mdma.c
+1
-3
drivers/dma/stm32-mdma.c
···
1578
1578
1579
1579
dmadev->nr_channels = nr_channels;
1580
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
1582
dmadev->ahb_addr_masks,
1583
1583
count);
1584
-
if (ret)
1585
-
return ret;
1586
1584
dmadev->nr_ahb_addr_masks = count;
1587
1585
1588
1586
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);