diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-16 21:16:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-16 21:16:41 +0100 |
| commit | 381bd9517a7e611871694689c67901d189cf6a62 (patch) | |
| tree | 7f9492cbbb93039ef84722e518e2ca6e8ad0c364 /drivers/spi/spi-atmel.c | |
| parent | 01b9e0418689951c6ae4ba3b221bc42f49eb6407 (diff) | |
| parent | f6bd03a746271f298aa5bfb6e049b245757efaed (diff) | |
| download | linux-381bd9517a7e611871694689c67901d189cf6a62.tar.gz linux-381bd9517a7e611871694689c67901d189cf6a62.tar.bz2 linux-381bd9517a7e611871694689c67901d189cf6a62.zip | |
Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel
Conflicts (trivial overlapping cleanups):
drivers/spi/spi-atmel.c
Diffstat (limited to 'drivers/spi/spi-atmel.c')
| -rw-r--r-- | drivers/spi/spi-atmel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index a828222c3e4e..ce4953f74423 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1401,7 +1401,8 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) asd = spi->controller_state; bits = (asd->csr >> 4) & 0xf; if (bits != xfer->bits_per_word - 8) { - dev_dbg(&spi->dev, "you can't yet change bits_per_word in transfers\n"); + dev_dbg(&spi->dev, + "you can't yet change bits_per_word in transfers\n"); return -ENOPROTOOPT; } } @@ -1582,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) { @@ -1613,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); |