summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlessandro Zummo <azummo-armlinux@towertech.it>2006-03-07 22:48:29 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-03-07 22:48:29 +0000
commit744bfe4c25716a7cfc5690aeab8d572b43d7c916 (patch)
tree3adae1ee63e4e6283779f789f8de85d1abb6acf2 /arch
parent6a0e243069b09a323255f6e847c87d531961cd96 (diff)
downloadlinux-744bfe4c25716a7cfc5690aeab8d572b43d7c916.tar.gz
linux-744bfe4c25716a7cfc5690aeab8d572b43d7c916.tar.bz2
linux-744bfe4c25716a7cfc5690aeab8d572b43d7c916.zip
[ARM] 3353/1: NAS100d: protect nas100d_power_exit() with machine_is_nas100d()
Patch from Alessandro Zummo nas100d_power_exit(void) gets some protection to avoid freeing an irq when it is not appropriate to do so. Signed-off-by: Rod Whitby <rod@whitby.id.au> Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ixp4xx/nas100d-power.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c
index 2bec69bfa715..99d333d7ebdd 100644
--- a/arch/arm/mach-ixp4xx/nas100d-power.c
+++ b/arch/arm/mach-ixp4xx/nas100d-power.c
@@ -56,6 +56,9 @@ static int __init nas100d_power_init(void)
static void __exit nas100d_power_exit(void)
{
+ if (!(machine_is_nas100d()))
+ return;
+
free_irq(NAS100D_RB_IRQ, NULL);
}