diff options
| author |   Sachin Kamat <sachin.kamat@linaro.org> | 2013-09-10 17:06:26 +0530 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2013-09-10 17:52:45 +0100 |
| commit | 8fec6f74a62c4e3d6897bc91f2eb08dfbadfe6da (patch) | |
| tree | 0bb615838c5c662d020523f7d944b3cab8d90803 | |
| parent | Merge remote-tracking branch 'spi/topic/txx9' into spi-next (diff) | |
| download | wireguard-linux-8fec6f74a62c4e3d6897bc91f2eb08dfbadfe6da.tar.xz wireguard-linux-8fec6f74a62c4e3d6897bc91f2eb08dfbadfe6da.zip | |
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 fd7cc566095a..d4ac60b4a56e 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); |