spi: sifive: disable clk when probe fails and remove (a725272b) · Commits · 戴 / test

drivers/spi/spi-sifive.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -357,14 +357,14 @@ static int sifive_spi_probe(struct platform_device *pdev)
		if (!cs_bits) {
		dev_err(&pdev->dev, "Could not auto probe CS lines\n");
		ret = -EINVAL;
		goto put_master;
		goto disable_clk;
		}

		num_cs = ilog2(cs_bits) + 1;
		if (num_cs > SIFIVE_SPI_MAX_CS) {
		dev_err(&pdev->dev, "Invalid number of spi slaves\n");
		ret = -EINVAL;
		goto put_master;
		goto disable_clk;
		}

		/* Define our master */
		@@ -393,7 +393,7 @@ static int sifive_spi_probe(struct platform_device *pdev)
		dev_name(&pdev->dev), spi);
		if (ret) {
		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",
		@@ -402,11 +402,13 @@ static int sifive_spi_probe(struct platform_device *pdev)
		ret = devm_spi_register_master(&pdev->dev, master);
		if (ret < 0) {
		dev_err(&pdev->dev, "spi_register_master failed\n");
		goto put_master;
		goto disable_clk;
		}

		return 0;

		disable_clk:
		clk_disable_unprepare(spi->clk);
		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 */
		sifive_spi_write(spi, SIFIVE_SPI_REG_IE, 0);
		clk_disable_unprepare(spi->clk);

		return 0;
		}