AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 04:40:51 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

spi: sifive: disable clk when probe fails and remove

Browse Source 
The driver forgets to disable and unprepare clk when probe fails and
remove.
Add the calls to fix the problem.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Reviewed-by: Palmer Dabbelt <palmer@dabbelt.com>
Link: https://lore.kernel.org/r/20191101121745.13413-1-hslester96@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Chuhong Yuan 2019-11-01 20:17:45 +08:00 committed by Mark Brown
parent f0cf17ed76
commit a725272bda
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/spi/spi-sifive.c
View File

@ -357,14 +357,14 @@ static int sifive_spi_probe(struct platform_device *pdev)
if (!cs_bits) { if (!cs_bits) {
dev_err(&pdev->dev, "Could not auto probe CS lines\n"); dev_err(&pdev->dev, "Could not auto probe CS lines\n");
ret = -EINVAL; ret = -EINVAL;
goto put_master; goto disable_clk;
} }
num_cs = ilog2(cs_bits) + 1; num_cs = ilog2(cs_bits) + 1;
if (num_cs > SIFIVE_SPI_MAX_CS) { if (num_cs > SIFIVE_SPI_MAX_CS) {
dev_err(&pdev->dev, "Invalid number of spi slaves\n"); dev_err(&pdev->dev, "Invalid number of spi slaves\n");
ret = -EINVAL; ret = -EINVAL;
goto put_master; goto disable_clk;
} }
/* Define our master */ /* Define our master */
@ -393,7 +393,7 @@ static int sifive_spi_probe(struct platform_device *pdev)
dev_name(&pdev->dev), spi); dev_name(&pdev->dev), spi);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Unable to bind to interrupt\n"); dev_err(&pdev->dev, "Unable to bind to interrupt\n");
goto put_master; goto disable_clk;
} }
dev_info(&pdev->dev, "mapped; irq=%d, cs=%d\n", dev_info(&pdev->dev, "mapped; irq=%d, cs=%d\n",
@ -402,11 +402,13 @@ static int sifive_spi_probe(struct platform_device *pdev)
ret = devm_spi_register_master(&pdev->dev, master); ret = devm_spi_register_master(&pdev->dev, master);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "spi_register_master failed\n"); dev_err(&pdev->dev, "spi_register_master failed\n");
goto put_master; goto disable_clk;
} }
return 0; return 0;
disable_clk:
clk_disable_unprepare(spi->clk);
put_master: put_master:
spi_master_put(master); spi_master_put(master);
@ -420,6 +422,7 @@ static int sifive_spi_remove(struct platform_device *pdev)
/* Disable all the interrupts just in case */ /* Disable all the interrupts just in case */
sifive_spi_write(spi, SIFIVE_SPI_REG_IE, 0); sifive_spi_write(spi, SIFIVE_SPI_REG_IE, 0);
clk_disable_unprepare(spi->clk);
return 0; return 0;
} }