aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-st-ssc4.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2016-04-29 01:39:38 -0400
committerMark Brown <broonie@kernel.org>2016-04-29 13:16:25 -0400
commit1051550e9d2d3550e7c17cd563b908638833979d (patch)
treeddc50e64f8e481369f3bbc1fdf9b7c9223a40642 /drivers/spi/spi-st-ssc4.c
parent83fefd2d5bec94de765305d44633c42371360a2a (diff)
spi: st-ssc4: Fix missing spi_master_put in spi_st_probe error paths
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-st-ssc4.c')
-rw-r--r--drivers/spi/spi-st-ssc4.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/spi/spi-st-ssc4.c b/drivers/spi/spi-st-ssc4.c
index f17c0abe299f..d5adf9f31602 100644
--- a/drivers/spi/spi-st-ssc4.c
+++ b/drivers/spi/spi-st-ssc4.c
@@ -345,12 +345,13 @@ static int spi_st_probe(struct platform_device *pdev)
345 spi_st->clk = devm_clk_get(&pdev->dev, "ssc"); 345 spi_st->clk = devm_clk_get(&pdev->dev, "ssc");
346 if (IS_ERR(spi_st->clk)) { 346 if (IS_ERR(spi_st->clk)) {
347 dev_err(&pdev->dev, "Unable to request clock\n"); 347 dev_err(&pdev->dev, "Unable to request clock\n");
348 return PTR_ERR(spi_st->clk); 348 ret = PTR_ERR(spi_st->clk);
349 goto put_master;
349 } 350 }
350 351
351 ret = spi_st_clk_enable(spi_st); 352 ret = spi_st_clk_enable(spi_st);
352 if (ret) 353 if (ret)
353 return ret; 354 goto put_master;
354 355
355 init_completion(&spi_st->done); 356 init_completion(&spi_st->done);
356 357
@@ -408,7 +409,8 @@ static int spi_st_probe(struct platform_device *pdev)
408 409
409clk_disable: 410clk_disable:
410 spi_st_clk_disable(spi_st); 411 spi_st_clk_disable(spi_st);
411 412put_master:
413 spi_master_put(master);
412 return ret; 414 return ret;
413} 415}
414 416