]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
dma: xilinx: Initialize variables xilinx_dma driver.
authorJoseph Zavodny <Joseph.Zavodny@jhuapl.edu>
Tue, 25 Aug 2015 19:27:58 +0000 (15:27 -0400)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 27 Aug 2015 11:49:14 +0000 (13:49 +0200)
desc was never initialized so dereferencing that pointer would invariably
result in a null pointer exception.  The residue must also be initialized
to zero.  These changes both fix compiler warnings.

Signed-off-by: Joseph Zavodny <Joseph.Zavodny@jhuapl.edu>
Acked-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/dma/xilinx/xilinx_dma.c

index 130e323b8872a2074cdbe1bef540adbbee3919b6..d32db15e6244bf099578f8c8cf5fc6ffeab6343f 100644 (file)
@@ -484,12 +484,12 @@ static enum dma_status xilinx_dma_tx_status(struct dma_chan *dchan,
                                            struct dma_tx_state *txstate)
 {
        struct xilinx_dma_chan *chan = to_xilinx_chan(dchan);
-       struct xilinx_dma_tx_descriptor *desc;
+       struct xilinx_dma_tx_descriptor *desc = chan->active_desc;
        struct xilinx_dma_tx_segment *segment;
        struct xilinx_dma_desc_hw *hw;
        enum dma_status ret;
        unsigned long flags;
-       u32 residue;
+       u32 residue = 0;
 
        ret = dma_cookie_status(dchan, cookie, txstate);
        if (ret == DMA_COMPLETE || !txstate)