Merge tag 'dmaengine-fix-5.1-rc3' of git://git.infradead.org/users/vkoul/slave-dma (c877b3df) · Commits · 戴 / test

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"

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -2356,7 +2356,7 @@ F: arch/arm/mm/cache-uniphier.c
		F: arch/arm64/boot/dts/socionext/uniphier*
		F: drivers/bus/uniphier-system-bus.c
		F: drivers/clk/uniphier/
		F: drivers/dmaengine/uniphier-mdmac.c
		F: drivers/dma/uniphier-mdmac.c
		F: drivers/gpio/gpio-uniphier.c
		F: drivers/i2c/busses/i2c-uniphier*
		F: drivers/irqchip/irq-uniphier-aidet.c

drivers/dma/stm32-mdma.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1578,11 +1578,9 @@ static int stm32_mdma_probe(struct platform_device *pdev)

		dmadev->nr_channels = nr_channels;
		dmadev->nr_requests = nr_requests;
		ret = device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks",
		device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks",
		dmadev->ahb_addr_masks,
		count);
		if (ret)
		return ret;
		dmadev->nr_ahb_addr_masks = count;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

Admin message