From 12f1876f3cf62adbf575a4a60ab2e785ffa74dea Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Tue, 9 Apr 2013 14:05:44 +0300
Subject: [PATCH] --- yaml --- r: 374651 b: refs/heads/master c:
 4e82f5ddd1e46fadc3a3c5aafdaec2d1416de9fe h: refs/heads/master i:   374649:
 50510b80c65ef2035d807357811d2c8fd4f436c2   374647:
 46c77792758fccea225fe78308f612a5277e7437 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/dma/dmaengine.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b70f89f19378..ef1e23eaf904 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b2e98bc1e35ebe1f65c3db62c8317096ad7f2c8
+refs/heads/master: 4e82f5ddd1e46fadc3a3c5aafdaec2d1416de9fe
diff --git a/trunk/drivers/dma/dmaengine.c b/trunk/drivers/dma/dmaengine.c
index d07ef7dc04ec..1b2df59d1d65 100644
--- a/trunk/drivers/dma/dmaengine.c
+++ b/trunk/drivers/dma/dmaengine.c
@@ -62,6 +62,8 @@
 #include <linux/rculist.h>
 #include <linux/idr.h>
 #include <linux/slab.h>
+#include <linux/acpi.h>
+#include <linux/acpi_dma.h>
 #include <linux/of_dma.h>
 
 static DEFINE_MUTEX(dma_list_mutex);
@@ -564,6 +566,10 @@ struct dma_chan *dma_request_slave_channel(struct device *dev, char *name)
 	if (dev->of_node)
 		return of_dma_request_slave_channel(dev->of_node, name);
 
+	/* If device was enumerated by ACPI get slave info from here */
+	if (ACPI_HANDLE(dev))
+		return acpi_dma_request_slave_chan_by_name(dev, name);
+
 	return NULL;
 }
 EXPORT_SYMBOL_GPL(dma_request_slave_channel);