mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andreas Fenkart <andreas.fenkart@streamunlimited.com>
To: tglx@linutronix.de
Cc: zonque@gmail.com, linux-kernel@vger.kernel.org,
	Andreas Fenkart <andreas.fenkart@streamunlimited.com>
Subject: [PATCH] genirq: use irq_mask as fallback for irq_disable.
Date: Fri, 19 Apr 2013 15:41:02 +0200	[thread overview]
Message-ID: <1366378862-22359-1-git-send-email-andreas.fenkart@streamunlimited.com> (raw)

This is in line with irq_enable that uses the same fallback.
When masked, interrupts are still latched into the status register
so when unmasked there is an interrupt straight away.

Signed-off-by: Andreas Fenkart <andreas.fenkart@streamunlimited.com>
---
 kernel/irq/chip.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index cbd97ce..21f87b7 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -216,10 +216,11 @@ void irq_enable(struct irq_desc *desc)
 void irq_disable(struct irq_desc *desc)
 {
 	irq_state_set_disabled(desc);
-	if (desc->irq_data.chip->irq_disable) {
+	if (desc->irq_data.chip->irq_disable)
 		desc->irq_data.chip->irq_disable(&desc->irq_data);
-		irq_state_set_masked(desc);
-	}
+	else
+		desc->irq_data.chip->irq_mask(&desc->irq_data);
+	irq_state_set_masked(desc);
 }
 
 void irq_percpu_enable(struct irq_desc *desc, unsigned int cpu)
-- 
1.7.10.4


             reply	other threads:[~2013-04-19 13:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-19 13:41 Andreas Fenkart [this message]
2013-04-22 23:24 ` Andrew Morton
2013-04-23 12:46   ` Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1366378862-22359-1-git-send-email-andreas.fenkart@streamunlimited.com \
    --to=andreas.fenkart@streamunlimited.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=zonque@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®