diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2019-05-03 15:20:04 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2019-05-03 15:20:58 +0200 |
commit | d00afd5ede1c29a6dc59be2d7fb7d6ef28eb85c5 (patch) | |
tree | e194b1968e54380a6654abf7d3a037ca0a010280 /drivers/dma | |
parent | 9a51b86a61214a297cdfc1bb705b7267f9455ae6 (diff) | |
parent | d5984d2a312144bedccf32aea2298f8df05bb617 (diff) | |
download | linux-d00afd5ede1c29a6dc59be2d7fb7d6ef28eb85c5.tar.bz2 |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-5.2
Mainly some pca954x work, i.e. removal of unused platform data support
and added support for sysfs interface for manipulating/examining the
idle state. And then a mechanical cocci-style patch.
Diffstat (limited to 'drivers/dma')
-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); |