Merge tag 'v3.9-rc2' into next

[firefly-linux-kernel-4.4.55.git] / drivers / dma / mmp_pdma.c

diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
index dc7466563507e6cc2d164556b4e8ce3f242ac51f..c26699f9c4dfdbcec1c3f0d6ee0cf3d173227294 100644 (file)
--- a/drivers/dma/mmp_pdma.c
+++ b/drivers/dma/mmp_pdma.c
@@ -618,10 +618,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: