From 22aac6ce80af1dab02932b87a11fe0588fe4c6cf Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Fri, 19 Apr 2013 11:42:13 +0200
Subject: [PATCH] --- yaml --- r: 374665 b: refs/heads/master c:
 f22eb1402244885126c4263eb36b857e4182dd6f h: refs/heads/master i:   374663:
 db90c20901d0cbdb7105f4204a6bc6e8c2ae6834 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/dma/of-dma.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0cb320fafb04..7a4859b33d35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af31826d9b1ce432e033f0e91529aa1013076482
+refs/heads/master: f22eb1402244885126c4263eb36b857e4182dd6f
diff --git a/trunk/drivers/dma/of-dma.c b/trunk/drivers/dma/of-dma.c
index 8266893fef45..2882403a39cf 100644
--- a/trunk/drivers/dma/of-dma.c
+++ b/trunk/drivers/dma/of-dma.c
@@ -221,12 +221,13 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
 
 		ofdma = of_dma_get_controller(&dma_spec);
 
-		if (!ofdma)
-			continue;
-
-		chan = ofdma->of_dma_xlate(&dma_spec, ofdma);
+		if (ofdma) {
+			chan = ofdma->of_dma_xlate(&dma_spec, ofdma);
 
-		of_dma_put_controller(ofdma);
+			of_dma_put_controller(ofdma);
+		} else {
+			chan = NULL;
+		}
 
 		of_node_put(dma_spec.np);