From 9e92c2c3577a306a04a016455570d28af72c2c1a Mon Sep 17 00:00:00 2001 From: Ira Snyder Date: Thu, 28 May 2009 09:26:40 +0000 Subject: [PATCH] --- yaml --- r: 156125 b: refs/heads/master c: 43a1a3ed6bf5a1b9ae197b4f5f20033baf19db61 h: refs/heads/master i: 156123: dfa03d13fc6e8b61f0b00cb61c06164837e7f409 v: v3 --- [refs] | 2 +- trunk/drivers/dma/fsldma.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 50b27a2780a0..3f1d3ee3d4e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be30b226f2ae618cd719e40267d9923db1db9001 +refs/heads/master: 43a1a3ed6bf5a1b9ae197b4f5f20033baf19db61 diff --git a/trunk/drivers/dma/fsldma.c b/trunk/drivers/dma/fsldma.c index 10bcf0cb0efc..6e60c77a145c 100644 --- a/trunk/drivers/dma/fsldma.c +++ b/trunk/drivers/dma/fsldma.c @@ -147,10 +147,11 @@ static void dma_start(struct fsl_dma_chan *fsl_chan) if (fsl_chan->feature & FSL_DMA_CHAN_PAUSE_EXT) { DMA_OUT(fsl_chan, &fsl_chan->reg_base->bcr, 0, 32); mr_set |= FSL_DMA_MR_EMP_EN; - } else + } else if ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX) { DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) & ~FSL_DMA_MR_EMP_EN, 32); + } if (fsl_chan->feature & FSL_DMA_CHAN_START_EXT) mr_set |= FSL_DMA_MR_EMS_EN;