diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-09-10 17:06:26 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 12:36:01 +0100 |
| commit | de8cc234a517b61c9a8450a34408dbae53aa171f (patch) | |
| tree | e7ea3d1916a53fe131e8b3b1e5368a91c8e3c03f | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
| download | op-kernel-dev-de8cc234a517b61c9a8450a34408dbae53aa171f.zip op-kernel-dev-de8cc234a517b61c9a8450a34408dbae53aa171f.tar.gz | |
spi: atmel: Fix incorrect error path
'irq' was not released when clk_prepare_enable failed.
Fix it.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/spi/spi-atmel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index fd7cc56..d4ac60b 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1583,7 +1583,7 @@ static int atmel_spi_probe(struct platform_device *pdev) /* Initialize the hardware */ ret = clk_prepare_enable(clk); if (ret) - goto out_unmap_regs; + goto out_free_irq; spi_writel(as, CR, SPI_BIT(SWRST)); spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */ if (as->caps.has_wdrbt) { @@ -1614,6 +1614,7 @@ out_free_dma: spi_writel(as, CR, SPI_BIT(SWRST)); spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */ clk_disable_unprepare(clk); +out_free_irq: free_irq(irq, master); out_unmap_regs: iounmap(as->regs); |
