diff options
| author | Nicolin Chen <nicoleotsuka@gmail.com> | 2014-06-16 05:32:29 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-07-25 10:40:24 +0200 |
| commit | 0b3518652c596b00c1592b5adb2544db75b5ef57 (patch) | |
| tree | 708e170f3140a93ec2a5fb9721b205b92107edeb /drivers/dma | |
| parent | dmaengine: pl330: Check if the DMA descriptor is NULL (diff) | |
| download | linux-0b3518652c596b00c1592b5adb2544db75b5ef57.tar.xz linux-0b3518652c596b00c1592b5adb2544db75b5ef57.zip | |
dmaengine: imx-sdma: Save imx_dma_data into sdmac
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>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index bbcf783707f1..8269c200b53b 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -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; } |