aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-nomadik.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-11-14 13:51:18 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-11-25 03:08:30 -0500
commit4705845b30e56a49f50ed84ba2dbff4f8fd389e9 (patch)
tree07cdd4a468fd07a68ac24779ae0c4a60023489f0 /drivers/pinctrl/pinctrl-nomadik.c
parentbc41f9f138bd93b82b08f84ca55b7da2acb847b3 (diff)
pinctrl: nomadik: always display IRQ in debugfs
As we now grab IRQs also without first reserving the GPIO line, let's print the mapped IRQ unconditionally in the debugfs file as well. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-nomadik.c')
-rw-r--r--drivers/pinctrl/pinctrl-nomadik.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 7111c3b59130..cea951f5fa49 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -846,14 +846,14 @@ static void nmk_gpio_dbg_show_one(struct seq_file *s,
846 (mode < 0) ? "unknown" : modes[mode], 846 (mode < 0) ? "unknown" : modes[mode],
847 pull ? "pull" : "none"); 847 pull ? "pull" : "none");
848 848
849 if (label && !is_out) { 849 if (!is_out) {
850 int irq = gpio_to_irq(gpio); 850 int irq = gpio_to_irq(gpio);
851 struct irq_desc *desc = irq_to_desc(irq); 851 struct irq_desc *desc = irq_to_desc(irq);
852 852
853 /* This races with request_irq(), set_irq_type(), 853 /* This races with request_irq(), set_irq_type(),
854 * and set_irq_wake() ... but those are "rare". 854 * and set_irq_wake() ... but those are "rare".
855 */ 855 */
856 if (irq >= 0 && desc->action) { 856 if (irq > 0 && desc && desc->action) {
857 char *trigger; 857 char *trigger;
858 u32 bitmask = nmk_gpio_get_bitmask(gpio); 858 u32 bitmask = nmk_gpio_get_bitmask(gpio);
859 859