Unverified Commit 8853b250 authored by Lukas Wunner's avatar Lukas Wunner Committed by Mark Brown
Browse files

spi: synquacer: Disable clock in probe error path 



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: b0823ee3 ("spi: Add spi driver for Socionext SynQuacer platform")
Signed-off-by: default avatarLukas 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: default avatarMark Brown <broonie@kernel.org>
parent 10a58c3a

drivers/spi/spi-synquacer.c

+8 −7
Original line number Diff line number Diff line
@@ -657,7 +657,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;
@@ -670,7 +671,7 @@ 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));
@@ -678,13 +679,13 @@ static int synquacer_spi_probe(struct platform_device *pdev) 
				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));
@@ -692,7 +693,7 @@ static int synquacer_spi_probe(struct platform_device *pdev) 
				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;
@@ -710,7 +711,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);
@@ -723,7 +724,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);