2012-05-05 18:46:18

by tip-bot for Yong Wang

[permalink] [raw]
Subject: [tip:x86/urgent] intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND

Commit-ID: ab27a20e6212cd1d96d813352b47e1fc1cfd01db
Gitweb: http://git.kernel.org/tip/ab27a20e6212cd1d96d813352b47e1fc1cfd01db
Author: Yong Wang <[email protected]>
AuthorDate: Fri, 4 May 2012 14:02:44 -0700
Committer: H. Peter Anvin <[email protected]>
CommitDate: Fri, 4 May 2012 14:40:52 -0700

intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND

So that the power button still wakes up the platform.

Signed-off-by: Pierre Tardy <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Tested-by: Kangkai Yin <[email protected]>
Tested-by: Yong Wang <[email protected]>
Signed-off-by: Kirill A. Shutemov <[email protected]>
Signed-off-by: Alan Cox <[email protected]>
Cc: Matthew Garrett <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
---
drivers/platform/x86/intel_mid_powerbtn.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
index 0a3594c..bcbad84 100644
--- a/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@ -78,7 +78,7 @@ static int __devinit mfld_pb_probe(struct platform_device *pdev)

input_set_capability(input, EV_KEY, KEY_POWER);

- error = request_threaded_irq(irq, NULL, mfld_pb_isr, 0,
+ error = request_threaded_irq(irq, NULL, mfld_pb_isr, IRQF_NO_SUSPEND,
DRIVER_NAME, input);
if (error) {
dev_err(&pdev->dev, "Unable to request irq %d for mfld power"