From a9090290b59ff300feebd1cab5fc81c4c4b97b8a Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 19 Jun 2008 03:18:09 +0100 Subject: [PATCH] --- yaml --- r: 105166 b: refs/heads/master c: bbae02035a87a3ef45f751032ec8d2bb6f3ed496 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/ssp.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6d85b780b882..3c8be5429618 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20072fd0c93349e19527dd2fa9588b4335960e62 +refs/heads/master: bbae02035a87a3ef45f751032ec8d2bb6f3ed496 diff --git a/trunk/arch/arm/mach-pxa/ssp.c b/trunk/arch/arm/mach-pxa/ssp.c index 00af7f2fed66..363668cc3a9c 100644 --- a/trunk/arch/arm/mach-pxa/ssp.c +++ b/trunk/arch/arm/mach-pxa/ssp.c @@ -285,7 +285,7 @@ int ssp_init(struct ssp_dev *dev, u32 port, u32 init_flags) goto out_region; dev->irq = ssp->irq; } else - dev->irq = 0; + dev->irq = NO_IRQ; /* turn on SSP port clock */ clk_enable(ssp->clk); @@ -306,7 +306,8 @@ void ssp_exit(struct ssp_dev *dev) struct ssp_device *ssp = dev->ssp; ssp_disable(dev); - free_irq(dev->irq, dev); + if (dev->irq != NO_IRQ) + free_irq(dev->irq, dev); clk_disable(ssp->clk); ssp_free(ssp); }