From 61db5876805fcd9112f9fdbdcc80b6b4fad6f59f Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Thu, 10 Jan 2013 10:52:58 +0200
Subject: [PATCH] --- yaml --- r: 358511 b: refs/heads/master c:
 f44b92f4dd2f6caf326b149e0b9636a1d4e50184 h: refs/heads/master i:   358509:
 6153da790e1cafcda6e1254f5a5aa7a745cdee00   358507:
 6ae12a3aa4c3fdca522bdfb047951fd92e1247fd   358503:
 e0be34153370e8df55e880ffe0db5b65d4dff8f5   358495:
 fca891a4b47e5fe2a8940687f581a684cb2952de v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/dma/dw_dmac.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cc0b32c04ab9..e73570e8b808 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e7264cc79a2d5c0ffa32c08d8f1cf84b2ec4fef
+refs/heads/master: f44b92f4dd2f6caf326b149e0b9636a1d4e50184
diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c
index 6c9e20a7ff51..ca996bc5ccaf 100644
--- a/trunk/drivers/dma/dw_dmac.c
+++ b/trunk/drivers/dma/dw_dmac.c
@@ -1355,6 +1355,9 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
 
 	retval = ERR_PTR(-EINVAL);
 
+	if (unlikely(!is_slave_direction(direction)))
+		goto out_err;
+
 	if (direction == DMA_MEM_TO_DEV)
 		reg_width = __ffs(sconfig->dst_addr_width);
 	else
@@ -1369,8 +1372,6 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
 		goto out_err;
 	if (unlikely(buf_addr & ((1 << reg_width) - 1)))
 		goto out_err;
-	if (unlikely(!(direction & (DMA_MEM_TO_DEV | DMA_DEV_TO_MEM))))
-		goto out_err;
 
 	retval = ERR_PTR(-ENOMEM);