From 794ae639ed42af661d3f8982ac85b9cfdd913d67 Mon Sep 17 00:00:00 2001
From: Rafal Prylowski <prylowski@metasoft.pl>
Date: Sat, 26 Nov 2011 12:54:07 +0200
Subject: [PATCH] --- yaml --- r: 286122 b: refs/heads/master c:
 b62cfc5e0e59d1e0192105144b724b0c332720a0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b8f76179d68b..1f36bc5dfb78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02f88be9488a3d831f073c1161b1e5feacb9d3ec
+refs/heads/master: b62cfc5e0e59d1e0192105144b724b0c332720a0
diff --git a/trunk/drivers/dma/ep93xx_dma.c b/trunk/drivers/dma/ep93xx_dma.c
index 009851b2aeea..526a7424f6a9 100644
--- a/trunk/drivers/dma/ep93xx_dma.c
+++ b/trunk/drivers/dma/ep93xx_dma.c
@@ -459,10 +459,6 @@ static int m2m_hw_setup(struct ep93xx_dma_chan *edmac)
 		 * This IDE part is totally untested. Values below are taken
 		 * from the EP93xx Users's Guide and might not be correct.
 		 */
-		control |= M2M_CONTROL_NO_HDSK;
-		control |= M2M_CONTROL_RSS_IDE;
-		control |= M2M_CONTROL_PW_16;
-
 		if (data->direction == DMA_MEM_TO_DEV) {
 			/* Worst case from the UG */
 			control = (3 << M2M_CONTROL_PWSC_SHIFT);
@@ -473,6 +469,10 @@ static int m2m_hw_setup(struct ep93xx_dma_chan *edmac)
 			control |= M2M_CONTROL_SAH;
 			control |= M2M_CONTROL_TM_RX;
 		}
+
+		control |= M2M_CONTROL_NO_HDSK;
+		control |= M2M_CONTROL_RSS_IDE;
+		control |= M2M_CONTROL_PW_16;
 		break;
 
 	default: