[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-2779db8d37d4b542d9ca2575f5f178dbeaca6c86@git.kernel.org>
Date: Fri, 28 Jun 2013 03:58:33 -0700
From: tip-bot for Ben Hutchings <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
bjarniig@....hi.is, tglx@...utronix.de, ben@...adent.org.uk
Subject: [tip:irq/core] genirq: Fix can_request_irq()
for IRQs without an action
Commit-ID: 2779db8d37d4b542d9ca2575f5f178dbeaca6c86
Gitweb: http://git.kernel.org/tip/2779db8d37d4b542d9ca2575f5f178dbeaca6c86
Author: Ben Hutchings <ben@...adent.org.uk>
AuthorDate: Fri, 28 Jun 2013 02:40:30 +0100
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 28 Jun 2013 12:56:03 +0200
genirq: Fix can_request_irq() for IRQs without an action
Commit 02725e7471b8 ('genirq: Use irq_get/put functions'),
inadvertently changed can_request_irq() to return 0 for IRQs that have
no action. This causes pcibios_lookup_irq() to select only IRQs that
already have an action with IRQF_SHARED set, or to fail if there are
none. Change can_request_irq() to return 1 for IRQs that have no
action (if the first two conditions are met).
Reported-by: Bjarni Ingi Gislason <bjarniig@....hi.is>
Tested-by: Bjarni Ingi Gislason <bjarniig@....hi.is> (against 3.2)
Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
Cc: 709647@...s.debian.org
Cc: stable@...r.kernel.org # 2.6.39+
Link: http://bugs.debian.org/709647
Link: http://lkml.kernel.org/r/1372383630.23847.40.camel@deadeye.wl.decadent.org.uk
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
kernel/irq/manage.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index e16caa8..514bcfd 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -555,9 +555,9 @@ int can_request_irq(unsigned int irq, unsigned long irqflags)
return 0;
if (irq_settings_can_request(desc)) {
- if (desc->action)
- if (irqflags & desc->action->flags & IRQF_SHARED)
- canrequest =1;
+ if (!desc->action ||
+ irqflags & desc->action->flags & IRQF_SHARED)
+ canrequest = 1;
}
irq_put_desc_unlock(desc, flags);
return canrequest;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists