From: tip-bot for Ian Campbell on
Commit-ID: 2dd9320305416c171087d5347a6c908ae22c6be1
Gitweb: http://git.kernel.org/tip/2dd9320305416c171087d5347a6c908ae22c6be1
Author: Ian Campbell <ian.campbell(a)citrix.com>
AuthorDate: Thu, 29 Jul 2010 11:16:33 +0100
Committer: Thomas Gleixner <tglx(a)linutronix.de>
CommitDate: Thu, 29 Jul 2010 13:24:57 +0200

ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt

ixp4xx_spkr_interrupt is not a timer interrupt and therefore should
not use IRQF_TIMER. Use the recently introduced IRQF_NO_SUSPEND
instead since that is the actual desired behaviour.

Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com>
Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
Cc: linux-input(a)vger.kernel.org
LKML-Reference: <1280398595-29708-2-git-send-email-ian.campbell(a)citrix.com>
Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de>
---
drivers/input/misc/ixp4xx-beeper.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 9946d73..9dfd6e5 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -115,7 +115,8 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
input_dev->event = ixp4xx_spkr_event;

err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt,
- IRQF_DISABLED | IRQF_TIMER, "ixp4xx-beeper", (void *) dev->id);
+ IRQF_DISABLED | IRQF_NO_SUSPEND, "ixp4xx-beeper",
+ (void *) dev->id);
if (err)
goto err_free_device;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/