aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2016-09-17 09:51:37 -0400
committerVinod Koul <vinod.koul@intel.com>2016-09-26 13:36:18 -0400
commit254e1254ff37239f946350fb5e93b8eea069b223 (patch)
tree4853386f03bfc9624a43a6d15e4230d2026b699a /drivers/dma
parent444fa14746c1c19384f91490ed4c19c67517949e (diff)
ste_dma40: Rename a jump label in d40_prep_desc()
Adjust jump labels according to the current Linux coding style convention. 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>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/ste_dma40.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 43f4e25c5aa2..087861af983e 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2210,13 +2210,13 @@ d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg,
2210 cfg->dst_info.data_width); 2210 cfg->dst_info.data_width);
2211 if (desc->lli_len < 0) { 2211 if (desc->lli_len < 0) {
2212 chan_err(chan, "Unaligned size\n"); 2212 chan_err(chan, "Unaligned size\n");
2213 goto err; 2213 goto free_desc;
2214 } 2214 }
2215 2215
2216 ret = d40_pool_lli_alloc(chan, desc, desc->lli_len); 2216 ret = d40_pool_lli_alloc(chan, desc, desc->lli_len);
2217 if (ret < 0) { 2217 if (ret < 0) {
2218 chan_err(chan, "Could not allocate lli\n"); 2218 chan_err(chan, "Could not allocate lli\n");
2219 goto err; 2219 goto free_desc;
2220 } 2220 }
2221 2221
2222 desc->lli_current = 0; 2222 desc->lli_current = 0;
@@ -2226,8 +2226,7 @@ d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg,
2226 dma_async_tx_descriptor_init(&desc->txd, &chan->chan); 2226 dma_async_tx_descriptor_init(&desc->txd, &chan->chan);
2227 2227
2228 return desc; 2228 return desc;
2229 2229 free_desc:
2230err:
2231 d40_desc_free(chan, desc); 2230 d40_desc_free(chan, desc);
2232 return NULL; 2231 return NULL;
2233} 2232}