From 3d43c7d194f69fd4d9c7b977715621a96a5eb63e Mon Sep 17 00:00:00 2001
From: Cong Ding <dinggnu@gmail.com>
Date: Tue, 15 Jan 2013 01:19:48 +0100
Subject: [PATCH] --- yaml --- r: 358522 b: refs/heads/master c:
 ed30933e6f3dbeaaab1de91e1bec25f42d5d32df h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2cbcbf506560..f0cedc2af397 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 661f7cb55c61fa7491e0caf21e55f59e5bc49abe
+refs/heads/master: ed30933e6f3dbeaaab1de91e1bec25f42d5d32df
diff --git a/trunk/drivers/dma/mmp_pdma.c b/trunk/drivers/dma/mmp_pdma.c
index 13bdf4a7e1ec..41ad6a62f838 100644
--- a/trunk/drivers/dma/mmp_pdma.c
+++ b/trunk/drivers/dma/mmp_pdma.c
@@ -617,10 +617,8 @@ static int mmp_pdma_control(struct dma_chan *dchan, enum dma_ctrl_cmd cmd,
 		else if (maxburst == 32)
 			chan->dcmd |= DCMD_BURST32;
 
-		if (cfg) {
-			chan->dir = cfg->direction;
-			chan->drcmr = cfg->slave_id;
-		}
+		chan->dir = cfg->direction;
+		chan->drcmr = cfg->slave_id;
 		chan->dev_addr = addr;
 		break;
 	default: