diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2010-07-29 11:16:33 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-07-29 13:24:57 +0200 |
| commit | 2dd9320305416c171087d5347a6c908ae22c6be1 (patch) | |
| tree | ded840a33b064b3fed09bc9f9f6885d4bce4f8d0 /drivers/input | |
| parent | 685fd0b4ea3f0f1d5385610b0d5b57775a8d5842 (diff) | |
| download | talos-obmc-linux-2dd9320305416c171087d5347a6c908ae22c6be1.tar.gz talos-obmc-linux-2dd9320305416c171087d5347a6c908ae22c6be1.zip | |
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@citrix.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
LKML-Reference: <1280398595-29708-2-git-send-email-ian.campbell@citrix.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | 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 9946d73624b9..9dfd6e5f786f 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; |
