diff options
| author | Alessandro Zummo <azummo-armlinux@towertech.it> | 2006-02-22 21:12:05 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-02-22 21:12:05 +0000 |
| commit | d7353b25c855b3a8103647503deaa98f512bd439 (patch) | |
| tree | 226a56a10ee90cd721c21b778fcb7a0497514477 /arch/arm/mach-ixp4xx | |
| parent | c27a2164a32cfda80dc1647638a940103669af3d (diff) | |
| download | kernel_samsung_espresso10-d7353b25c855b3a8103647503deaa98f512bd439.zip kernel_samsung_espresso10-d7353b25c855b3a8103647503deaa98f512bd439.tar.gz kernel_samsung_espresso10-d7353b25c855b3a8103647503deaa98f512bd439.tar.bz2 | |
[ARM] 3342/1: NSLU2: Protect power button init routine with machine_is_nslu2()
Patch from Alessandro Zummo
The power button exit routine for the Linksys NSLU2 was not protected by
a machine_is_nslu2(). This patch fixes it.
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/arm/mach-ixp4xx')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-power.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-power.c b/arch/arm/mach-ixp4xx/nslu2-power.c index b0ad9e9..d80c362 100644 --- a/arch/arm/mach-ixp4xx/nslu2-power.c +++ b/arch/arm/mach-ixp4xx/nslu2-power.c @@ -77,6 +77,9 @@ static int __init nslu2_power_init(void) static void __exit nslu2_power_exit(void) { + if (!(machine_is_nslu2())) + return; + free_irq(NSLU2_RB_IRQ, NULL); free_irq(NSLU2_PB_IRQ, NULL); } |