Merge tag 'stable/for-linus-3.12-rc0-tag-three' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / dma / imx-dma.c

diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index ff2aab9..78f8ca5 100644 (file)
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -805,10 +805,8 @@ static void imxdma_free_chan_resources(struct dma_chan *chan)
        }
        INIT_LIST_HEAD(&imxdmac->ld_free);
 
-       if (imxdmac->sg_list) {
-               kfree(imxdmac->sg_list);
-               imxdmac->sg_list = NULL;
-       }
+       kfree(imxdmac->sg_list);
+       imxdmac->sg_list = NULL;
 }
 
 static struct dma_async_tx_descriptor *imxdma_prep_slave_sg(