---

yaml --- r: 374665 b: refs/heads/master c: f22eb14 h: refs/heads/master i: 374663: db90c20 v: v3
git-mirror · May 2, 2013 · 22aac6c · 22aac6c
1 parent 7ef0af7
commit 22aac6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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);