diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-01-31 23:34:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-01-31 23:34:08 -0800 |
| commit | b4e1d7f151a364896215e5a6b02c68f3fddbf720 (patch) | |
| tree | b13b01e8e4470ee3d5ec37e34ded8d04626b15fd | |
| parent | a50de1c422207d617a063da7c89d25593c362705 (diff) | |
| parent | 1e5d49626264bfe5bec6e22bc825e5211ba13653 (diff) | |
Merge nuts.davemloft.net:/disk1/davem/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/davem/BK/sparc-2.6
| -rw-r--r-- | arch/sparc64/kernel/power.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c index b53ecb88a780..bebec2e39398 100644 --- a/arch/sparc64/kernel/power.c +++ b/arch/sparc64/kernel/power.c @@ -29,8 +29,8 @@ static int button_pressed; static irqreturn_t power_handler(int irq, void *dev_id, struct pt_regs *regs) { if (button_pressed == 0) { - wake_up(&powerd_wait); button_pressed = 1; + wake_up(&powerd_wait); } /* FIXME: Check registers for status... */ @@ -86,10 +86,10 @@ again: remove_wait_queue(&powerd_wait, &wait); /* Ok, down we go... */ + button_pressed = 0; if (execve("/sbin/shutdown", argv, envp) < 0) { printk("powerd: shutdown execution failed\n"); add_wait_queue(&powerd_wait, &wait); - button_pressed = 0; goto again; } return 0; |