diff options
| author | Fugang Duan <b38611@freescale.com> | 2016-01-11 17:42:44 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 11:03:10 -0600 |
| commit | c133fe8a0e541eff6e998ea3803c009d924a6934 (patch) | |
| tree | aeb48637d4095d69a696d4d550afbadf847f4732 /drivers/dma | |
| parent | 704982402a4d445c02ecdfbf121e16180bf40454 (diff) | |
MLK-12188 dmaengine: fsl-edma: add fsl_chan->edesc NULL check
Add fsl_chan->edesc NULL when calling .fsl_edma_desc_residue() to avoid
NULL pointer access.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/fsl-edma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c index 09e2842d15ec..22b6936ccc3e 100644 --- a/drivers/dma/fsl-edma.c +++ b/drivers/dma/fsl-edma.c @@ -416,7 +416,7 @@ static enum dma_status fsl_edma_tx_status(struct dma_chan *chan, vdesc = vchan_find_desc(&fsl_chan->vchan, cookie); if (fsl_chan->edesc && cookie == fsl_chan->edesc->vdesc.tx.cookie) txstate->residue = fsl_edma_desc_residue(fsl_chan, vdesc, true); - else if (vdesc) + else if (fsl_chan->edesc && vdesc) txstate->residue = fsl_edma_desc_residue(fsl_chan, vdesc, false); else txstate->residue = 0; |