[PATCH 3/3] spi: switch to devm_spi_alloc_master
From: Stephen Warren <hidden>
Date: 2014-01-31 16:18:27
Also in:
linux-spi, lkml
On 01/31/2014 03:23 AM, Maxime Ripard wrote:
Make the existing users of devm_spi_register_master use the devm_spi_alloc_master function to avoid leaking memory.
quoted hunk ↗ jump to hunk
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
quoted hunk ↗ jump to hunk
@@ -1087,14 +1085,13 @@ static int tegra_spi_probe(struct platform_device *pdev) if (ret < 0) { dev_err(&pdev->dev, "Failed to register ISR for IRQ %d\n", tspi->irq); - goto exit_free_master; + return ret; } tspi->clk = devm_clk_get(&pdev->dev, "spi"); if (IS_ERR(tspi->clk)) { dev_err(&pdev->dev, "can not get clock\n"); - ret = PTR_ERR(tspi->clk); - goto exit_free_irq; + return PTR_ERR(tspi->clk); } tspi->max_buf_size = SPI_FIFO_DEPTH << 2;@@ -1152,8 +1149,6 @@ exit_rx_dma_free: tegra_spi_deinit_dma_param(tspi, true); exit_free_irq: free_irq(spi_irq, tspi); -exit_free_master: - spi_master_put(master); return ret;
Doesn't that s/goto exit_free_irq/return/ leak spi_irq? It's only OK to replace goto free_master with a direct return. The other two Tegra drivers don't seem to have this problem.