Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754751AbbDNKhG (ORCPT ); Tue, 14 Apr 2015 06:37:06 -0400 Received: from mail.codelabs.ch ([217.150.249.120]:38232 "EHLO fenrir.codelabs.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753022AbbDNKg4 (ORCPT ); Tue, 14 Apr 2015 06:36:56 -0400 X-Greylist: delayed 458 seconds by postgrey-1.27 at vger.kernel.org; Tue, 14 Apr 2015 06:36:56 EDT From: Adrian-Ken Rueegsegger To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Adrian-Ken Rueegsegger Subject: [PATCH] genirq: Only call irq_ack if implemented by chip Date: Tue, 14 Apr 2015 12:29:07 +0200 Message-Id: <1429007347-7167-1-git-send-email-ken@codelabs.ch> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1101 Lines: 32 Restore the check if an IRQ chip implements the irq_ack function prior to its invocation. Commit 22a49163e90d ("genirq: Provide compat handling for chip->ack()") removed the check from handle_edge_irq while keeping the check in other call paths. Signed-off-by: Adrian-Ken Rueegsegger --- kernel/irq/chip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index eb9a4ea..3889b02 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -586,7 +586,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) kstat_incr_irqs_this_cpu(irq, desc); /* Start handling the irq */ - desc->irq_data.chip->irq_ack(&desc->irq_data); + if (desc->irq_data.chip->irq_ack) + desc->irq_data.chip->irq_ack(&desc->irq_data); do { if (unlikely(!desc->action)) { -- 1.7.10.4 -- 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/