diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-04-15 10:39:59 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-04-15 10:39:59 +0000 |
| commit | 907c2d35eb8bb9f592909eb017820b7a8fe62ec6 (patch) | |
| tree | 554007e0ccb541d5e08b7741d7d302e978902df4 /packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch | |
| parent | 7a74595f87ad18f7435ce192f9667b962225087e (diff) | |
| parent | 822be3b99d846eb5fc1bb4c3a665d439c0c1f7a4 (diff) | |
merge of '9bafa1b756e6de75c93929437624ddf20c6155f3'
and 'ae71623a2c722c78935fc0461cdcaab87317ba3b'
Diffstat (limited to 'packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch')
| -rw-r--r-- | packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch b/packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch new file mode 100644 index 0000000000..791a66e02a --- /dev/null +++ b/packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch @@ -0,0 +1,60 @@ +Index: linux-2.6.21/drivers/cbus/retu-pwrbutton.c +=================================================================== +--- linux-2.6.21.orig/drivers/cbus/retu-pwrbutton.c 2008-02-20 22:44:18.000000000 +0000 ++++ linux-2.6.21/drivers/cbus/retu-pwrbutton.c 2008-02-20 22:46:22.000000000 +0000 +@@ -53,7 +53,9 @@ + state = PWRBTN_PRESSED; + + if (pwrbtn_state != state) { +- input_report_key(pwrbtn_dev, KEY_POWER, state); ++ input_report_key(pwrbtn_dev, KEY_SUSPEND, state); ++ if (state == PWRBTN_PRESSED) ++ input_event(pwrbtn_dev, EV_PWR, KEY_SUSPEND, 1); + pwrbtn_state = state; + } + } +@@ -92,8 +94,8 @@ + if (!pwrbtn_dev) + return -ENOMEM; + +- pwrbtn_dev->evbit[0] = BIT(EV_KEY); +- pwrbtn_dev->keybit[LONG(KEY_POWER)] = BIT(KEY_POWER); ++ pwrbtn_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR); ++ pwrbtn_dev->keybit[LONG(KEY_SUSPEND)] = BIT(KEY_SUSPEND); + pwrbtn_dev->name = "retu-pwrbutton"; + + input_register_device(pwrbtn_dev); +Index: linux-2.6.21/drivers/char/apm-emulation.c +=================================================================== +--- linux-2.6.21.orig/drivers/char/apm-emulation.c 2008-02-21 00:32:41.000000000 +0000 ++++ linux-2.6.21/drivers/char/apm-emulation.c 2008-02-21 00:33:43.000000000 +0000 +@@ -206,10 +206,18 @@ + return ret; + } + ++static in_suspend; ++ + static void apm_suspend(void) + { + struct apm_user *as; +- int err = pm_suspend(PM_SUSPEND_MEM); ++ int err; ++ ++ in_suspend = 1; ++ ++ err = pm_suspend(PM_SUSPEND_MEM); ++ ++ in_suspend = 0; + + /* + * Anyone on the APM queues will think we're still suspended. +@@ -663,6 +671,9 @@ + { + unsigned long flags; + ++ if (in_suspend) ++ return; ++ + spin_lock_irqsave(&kapmd_queue_lock, flags); + queue_add_event(&kapmd_queue, event); + spin_unlock_irqrestore(&kapmd_queue_lock, flags); |