Commit c877b3df authored by Linus Torvalds's avatar Linus Torvalds

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"
parents b5c8314f d498bc0c
...@@ -2356,7 +2356,7 @@ F: arch/arm/mm/cache-uniphier.c ...@@ -2356,7 +2356,7 @@ F: arch/arm/mm/cache-uniphier.c
F: arch/arm64/boot/dts/socionext/uniphier* F: arch/arm64/boot/dts/socionext/uniphier*
F: drivers/bus/uniphier-system-bus.c F: drivers/bus/uniphier-system-bus.c
F: drivers/clk/uniphier/ F: drivers/clk/uniphier/
F: drivers/dmaengine/uniphier-mdmac.c F: drivers/dma/uniphier-mdmac.c
F: drivers/gpio/gpio-uniphier.c F: drivers/gpio/gpio-uniphier.c
F: drivers/i2c/busses/i2c-uniphier* F: drivers/i2c/busses/i2c-uniphier*
F: drivers/irqchip/irq-uniphier-aidet.c F: drivers/irqchip/irq-uniphier-aidet.c
......
...@@ -1578,11 +1578,9 @@ static int stm32_mdma_probe(struct platform_device *pdev) ...@@ -1578,11 +1578,9 @@ static int stm32_mdma_probe(struct platform_device *pdev)
dmadev->nr_channels = nr_channels; dmadev->nr_channels = nr_channels;
dmadev->nr_requests = nr_requests; 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, dmadev->ahb_addr_masks,
count); count);
if (ret)
return ret;
dmadev->nr_ahb_addr_masks = count; dmadev->nr_ahb_addr_masks = count;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment