]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ste_dma40: Move an assignment in d40_prep_desc()
authorMarkus Elfring <elfring@users.sourceforge.net>
Sat, 17 Sep 2016 13:54:12 +0000 (15:54 +0200)
committerVinod Koul <vinod.koul@intel.com>
Mon, 26 Sep 2016 17:36:18 +0000 (23:06 +0530)
Move one assignment for the local variable "cfg" so that its setting
will only be performed after a call of the function "d40_desc_get"
succeeded by this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/ste_dma40.c

index 087861af983e1ea4afcefb24b4ac3007c13a9aca..07e7eb39eda1d084702c36a5a6a6bfa2bf077c0d 100644 (file)
@@ -2198,7 +2198,7 @@ static struct d40_desc *
 d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg,
              unsigned int sg_len, unsigned long dma_flags)
 {
-       struct stedma40_chan_cfg *cfg = &chan->dma_cfg;
+       struct stedma40_chan_cfg *cfg;
        struct d40_desc *desc;
        int ret;
 
@@ -2206,6 +2206,7 @@ d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg,
        if (!desc)
                return NULL;
 
+       cfg = &chan->dma_cfg;
        desc->lli_len = d40_sg_2_dmalen(sg, sg_len, cfg->src_info.data_width,
                                        cfg->dst_info.data_width);
        if (desc->lli_len < 0) {