diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2015-01-14 15:16:28 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-01-25 22:44:23 -0800 |
| commit | c914570f28552eb4ed6f016ec7b1db292a7c924b (patch) | |
| tree | a7b9df9b16d9614c92d8c1bb47b550d3e5879e6d /drivers/dma | |
| parent | 640f204bcdea927f4c2ce4af76a5e92736f20019 (diff) | |
| download | linux-stable-c914570f28552eb4ed6f016ec7b1db292a7c924b.tar.gz linux-stable-c914570f28552eb4ed6f016ec7b1db292a7c924b.tar.bz2 linux-stable-c914570f28552eb4ed6f016ec7b1db292a7c924b.zip | |
dmaengine: of: bail out early if "dmas" property is not present
And don't print an error: not configured is not an error.
Reported-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/of-dma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c index d5fbeaa1e7ba..ca31f1b45366 100644 --- a/drivers/dma/of-dma.c +++ b/drivers/dma/of-dma.c @@ -159,6 +159,10 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np, return ERR_PTR(-ENODEV); } + /* Silently fail if there is not even the "dmas" property */ + if (!of_find_property(np, "dmas", NULL)) + return ERR_PTR(-ENODEV); + count = of_property_count_strings(np, "dma-names"); if (count < 0) { pr_err("%s: dma-names property of node '%s' missing or empty\n", |