diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-31 07:42:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-31 07:42:39 -0700 |
| commit | c877b3df8527f010ef068704033acac1d43cbf8c (patch) | |
| tree | 2d305debb82348b60dff997c34ca318b17e87338 /drivers | |
| parent | Merge tag 'led-fixes-for-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds (diff) | |
| parent | MAINTAINERS: Fix uniphier-mdmac.c file path (diff) | |
| download | linux-dev-c877b3df8527f010ef068704033acac1d43cbf8c.tar.xz linux-dev-c877b3df8527f010ef068704033acac1d43cbf8c.zip | |
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"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/stm32-mdma.c | 4 |
1 files changed, 1 insertions, 3 deletions
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) 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); |