diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-11-14 19:51:18 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-25 09:08:30 +0100 |
| commit | 4705845b30e56a49f50ed84ba2dbff4f8fd389e9 (patch) | |
| tree | 07cdd4a468fd07a68ac24779ae0c4a60023489f0 /drivers/pinctrl/pinctrl-nomadik.c | |
| parent | bc41f9f138bd93b82b08f84ca55b7da2acb847b3 (diff) | |
| download | op-kernel-dev-4705845b30e56a49f50ed84ba2dbff4f8fd389e9.zip op-kernel-dev-4705845b30e56a49f50ed84ba2dbff4f8fd389e9.tar.gz | |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 7111c3b..cea951f 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, (mode < 0) ? "unknown" : modes[mode], pull ? "pull" : "none"); - if (label && !is_out) { - int irq = gpio_to_irq(gpio); + if (!is_out) { + int irq = gpio_to_irq(gpio); struct irq_desc *desc = irq_to_desc(irq); /* This races with request_irq(), set_irq_type(), * and set_irq_wake() ... but those are "rare". */ - if (irq >= 0 && desc->action) { + if (irq > 0 && desc && desc->action) { char *trigger; u32 bitmask = nmk_gpio_get_bitmask(gpio); |
