diff options
author | Mark Brown <broonie@sirena.org.uk> | 2008-06-18 22:18:09 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 12:07:36 -0400 |
commit | bbae02035a87a3ef45f751032ec8d2bb6f3ed496 (patch) | |
tree | e337cda2faf1244e0ca721f9ee0390e8ef1f4c08 | |
parent | 20072fd0c93349e19527dd2fa9588b4335960e62 (diff) |
[ARM] 5108/2: PXA SSP: Don't unconditionally free interrupt
Callers may stop the SSP core requesting the interrupt so it can't be
freed unconditionally. Also use NO_IRQ like we should.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-pxa/ssp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c index 00af7f2fed66..363668cc3a9c 100644 --- a/arch/arm/mach-pxa/ssp.c +++ b/arch/arm/mach-pxa/ssp.c | |||
@@ -285,7 +285,7 @@ int ssp_init(struct ssp_dev *dev, u32 port, u32 init_flags) | |||
285 | goto out_region; | 285 | goto out_region; |
286 | dev->irq = ssp->irq; | 286 | dev->irq = ssp->irq; |
287 | } else | 287 | } else |
288 | dev->irq = 0; | 288 | dev->irq = NO_IRQ; |
289 | 289 | ||
290 | /* turn on SSP port clock */ | 290 | /* turn on SSP port clock */ |
291 | clk_enable(ssp->clk); | 291 | clk_enable(ssp->clk); |
@@ -306,7 +306,8 @@ void ssp_exit(struct ssp_dev *dev) | |||
306 | struct ssp_device *ssp = dev->ssp; | 306 | struct ssp_device *ssp = dev->ssp; |
307 | 307 | ||
308 | ssp_disable(dev); | 308 | ssp_disable(dev); |
309 | free_irq(dev->irq, dev); | 309 | if (dev->irq != NO_IRQ) |
310 | free_irq(dev->irq, dev); | ||
310 | clk_disable(ssp->clk); | 311 | clk_disable(ssp->clk); |
311 | ssp_free(ssp); | 312 | ssp_free(ssp); |
312 | } | 313 | } |