Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756741Ab0G2KQ5 (ORCPT ); Thu, 29 Jul 2010 06:16:57 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:28804 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756637Ab0G2KQq (ORCPT ); Thu, 29 Jul 2010 06:16:46 -0400 X-IronPort-AV: E=Sophos;i="4.55,279,1278302400"; d="scan'208";a="107549399" From: Ian Campbell To: linux-kernel@vger.kernel.org Cc: Ian Campbell , Thomas Gleixner , Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH 2/4] ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt Date: Thu, 29 Jul 2010 11:16:33 +0100 Message-Id: <1280398595-29708-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1280398573.24292.1684.camel@zakaz.uk.xensource.com> References: <1280398573.24292.1684.camel@zakaz.uk.xensource.com> X-OriginalArrivalTime: 29 Jul 2010 10:16:45.0788 (UTC) FILETIME=[25EEE1C0:01CB2F07] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1299 Lines: 34 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 Cc: Thomas Gleixner Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org --- 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; -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/