dmaengine: imx-sdma: Save imx_dma_data into sdmac
authorNicolin Chen <nicoleotsuka@gmail.com>
Mon, 16 Jun 2014 03:32:29 +0000 (11:32 +0800)
committerVinod Koul <vinod.koul@intel.com>
Fri, 25 Jul 2014 08:40:24 +0000 (14:10 +0530)
The filter() function is currently called by xlate() while it transfers
imx_dma_data as a local variable to the filter() but releases the data
right after returning a DMA channel pointer, which results chan->private
pointing an invalid memory space.

So this patch just stores the imx_dma_data into sdmac to make usre the
private pointer valid as long as the channel exists.

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/imx-sdma.c

index bbcf783707f1953d85b151787ff6768cee1f44f6..8269c200b53b49360c2ae29dfb9387436b2dc87b 100644 (file)
@@ -271,6 +271,7 @@ struct sdma_channel {
        unsigned int                    chn_count;
        unsigned int                    chn_real_count;
        struct tasklet_struct           tasklet;
+       struct imx_dma_data             data;
 };
 
 #define IMX_DMA_SG_LOOP                BIT(0)
@@ -1413,12 +1414,14 @@ err_dma_alloc:
 
 static bool sdma_filter_fn(struct dma_chan *chan, void *fn_param)
 {
+       struct sdma_channel *sdmac = to_sdma_chan(chan);
        struct imx_dma_data *data = fn_param;
 
        if (!imx_dma_is_general_purpose(chan))
                return false;
 
-       chan->private = data;
+       sdmac->data = *data;
+       chan->private = &sdmac->data;
 
        return true;
 }