aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2008-08-08 14:12:04 +0000
committerJohn Crispin <john@openwrt.org>2008-08-08 14:12:04 +0000
commit2bd17fe1cb272d9baba3df593805543f615415b9 (patch)
tree025c717de8911fcd79b1b4037b0d6b5a08493799
parentc11df62fb8f2dc85d1a229b1b7f1130b19c6cace (diff)
downloadupstream-2bd17fe1cb272d9baba3df593805543f615415b9.tar.gz
upstream-2bd17fe1cb272d9baba3df593805543f615415b9.tar.bz2
upstream-2bd17fe1cb272d9baba3df593805543f615415b9.zip
fixes kernel oops when reset button was pressed too often on atheros
SVN-Revision: 12245
-rw-r--r--target/linux/atheros/files/arch/mips/atheros/reset.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/atheros/files/arch/mips/atheros/reset.c b/target/linux/atheros/files/arch/mips/atheros/reset.c
index a94954d091..eb525da207 100644
--- a/target/linux/atheros/files/arch/mips/atheros/reset.c
+++ b/target/linux/atheros/files/arch/mips/atheros/reset.c
@@ -129,10 +129,8 @@ static irqreturn_t button_handler(int irq, void *dev_id)
seen = jiffies;
if(event->set && no_release_workaround)
- {
- rst_button_timer.expires = jiffies + (HZ / 4);
- add_timer(&rst_button_timer);
- }
+ mod_timer(&rst_button_timer, jiffies + (HZ / 4));
+
return IRQ_HANDLED;
}