diff options
Diffstat (limited to 'drivers/dma/dmaengine.c')
-rw-r--r-- | drivers/dma/dmaengine.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index ed610b497518..a886713937fd 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
@@ -627,18 +627,13 @@ EXPORT_SYMBOL_GPL(__dma_request_channel); | |||
627 | struct dma_chan *dma_request_slave_channel_reason(struct device *dev, | 627 | struct dma_chan *dma_request_slave_channel_reason(struct device *dev, |
628 | const char *name) | 628 | const char *name) |
629 | { | 629 | { |
630 | struct dma_chan *chan; | ||
631 | |||
632 | /* If device-tree is present get slave info from here */ | 630 | /* If device-tree is present get slave info from here */ |
633 | if (dev->of_node) | 631 | if (dev->of_node) |
634 | return of_dma_request_slave_channel(dev->of_node, name); | 632 | return of_dma_request_slave_channel(dev->of_node, name); |
635 | 633 | ||
636 | /* If device was enumerated by ACPI get slave info from here */ | 634 | /* If device was enumerated by ACPI get slave info from here */ |
637 | if (ACPI_HANDLE(dev)) { | 635 | if (ACPI_HANDLE(dev)) |
638 | chan = acpi_dma_request_slave_chan_by_name(dev, name); | 636 | return acpi_dma_request_slave_chan_by_name(dev, name); |
639 | if (chan) | ||
640 | return chan; | ||
641 | } | ||
642 | 637 | ||
643 | return ERR_PTR(-ENODEV); | 638 | return ERR_PTR(-ENODEV); |
644 | } | 639 | } |