Skip to content

Commit

Permalink
spi: synquacer: Disable clock in probe error path
Browse files Browse the repository at this point in the history
commit 8853b25 upstream.

If the calls to platform_get_irq() or devm_request_irq() fail on probe
of the SynQuacer SPI driver, the clock "sspi->clk" is erroneously not
unprepared and disabled.

If the clock rate "master->max_speed_hz" cannot be determined, the same
happens and in addition the spi_master struct is not freed.

Fix it.

Fixes: b0823ee ("spi: Add spi driver for Socionext SynQuacer platform")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: <stable@vger.kernel.org> # v5.3+
Cc: Masahisa Kojima <masahisa.kojima@linaro.org>
Link: https://lore.kernel.org/r/232281df1ab91d8f0f553a62d5f97fc264ace4da.1604874488.git.lukas@wunner.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
l1k authored and gregkh committed Dec 30, 2020
1 parent 4051e5b commit cad1895
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/spi/spi-synquacer.c
Expand Up @@ -658,7 +658,8 @@ static int synquacer_spi_probe(struct platform_device *pdev)

if (!master->max_speed_hz) {
dev_err(&pdev->dev, "missing clock source\n");
return -EINVAL;
ret = -EINVAL;
goto disable_clk;
}
master->min_speed_hz = master->max_speed_hz / 254;

Expand All @@ -671,29 +672,29 @@ static int synquacer_spi_probe(struct platform_device *pdev)
rx_irq = platform_get_irq(pdev, 0);
if (rx_irq <= 0) {
ret = rx_irq;
goto put_spi;
goto disable_clk;
}
snprintf(sspi->rx_irq_name, SYNQUACER_HSSPI_IRQ_NAME_MAX, "%s-rx",
dev_name(&pdev->dev));
ret = devm_request_irq(&pdev->dev, rx_irq, sq_spi_rx_handler,
0, sspi->rx_irq_name, sspi);
if (ret) {
dev_err(&pdev->dev, "request rx_irq failed (%d)\n", ret);
goto put_spi;
goto disable_clk;
}

tx_irq = platform_get_irq(pdev, 1);
if (tx_irq <= 0) {
ret = tx_irq;
goto put_spi;
goto disable_clk;
}
snprintf(sspi->tx_irq_name, SYNQUACER_HSSPI_IRQ_NAME_MAX, "%s-tx",
dev_name(&pdev->dev));
ret = devm_request_irq(&pdev->dev, tx_irq, sq_spi_tx_handler,
0, sspi->tx_irq_name, sspi);
if (ret) {
dev_err(&pdev->dev, "request tx_irq failed (%d)\n", ret);
goto put_spi;
goto disable_clk;
}

master->dev.of_node = np;
Expand All @@ -711,7 +712,7 @@ static int synquacer_spi_probe(struct platform_device *pdev)

ret = synquacer_spi_enable(master);
if (ret)
goto fail_enable;
goto disable_clk;

pm_runtime_set_active(sspi->dev);
pm_runtime_enable(sspi->dev);
Expand All @@ -724,7 +725,7 @@ static int synquacer_spi_probe(struct platform_device *pdev)

disable_pm:
pm_runtime_disable(sspi->dev);
fail_enable:
disable_clk:
clk_disable_unprepare(sspi->clk);
put_spi:
spi_master_put(master);
Expand Down

0 comments on commit cad1895

Please sign in to comment.