---

yaml --- r: 358522 b: refs/heads/master c: ed30933 h: refs/heads/master v: v3
git-mirror · Jan 20, 2013 · 3d43c7d · 3d43c7d
1 parent 12d55b3
commit 3d43c7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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: