diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2006-07-25 16:12:51 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-08-03 15:21:20 +0200 |
| commit | 2566d36ab4f0b90141bb59a5f7342255751fbf45 (patch) | |
| tree | 086251f284de9f559235164e3ab0594e6456b2ec /sound/aoa | |
| parent | [ALSA] Conversions from kmalloc+memset to k(z|c)alloc (diff) | |
| download | linux-2566d36ab4f0b90141bb59a5f7342255751fbf45.tar.xz linux-2566d36ab4f0b90141bb59a5f7342255751fbf45.zip | |
[ALSA] aoa: feature gpio layer: fix IRQ access
The IRQ rework caused some hiccups here, in some cases we call
get_irq without a device node. This patch makes it catch that
case and return NO_IRQ when it happens, along with changing the
place where the irq is checked to check for NO_IRQ instead of -1.
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/aoa')
| -rw-r--r-- | sound/aoa/core/snd-aoa-gpio-feature.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/aoa/core/snd-aoa-gpio-feature.c b/sound/aoa/core/snd-aoa-gpio-feature.c index 7ae0c0bdfad8..f69d33357a28 100644 --- a/sound/aoa/core/snd-aoa-gpio-feature.c +++ b/sound/aoa/core/snd-aoa-gpio-feature.c @@ -112,7 +112,10 @@ static struct device_node *get_gpio(char *name, static void get_irq(struct device_node * np, int *irqptr) { - *irqptr = irq_of_parse_and_map(np, 0); + if (np) + *irqptr = irq_of_parse_and_map(np, 0); + else + *irqptr = NO_IRQ; } /* 0x4 is outenable, 0x1 is out, thus 4 or 5 */ @@ -322,7 +325,7 @@ static int ftr_set_notify(struct gpio_runtime *rt, return -EINVAL; } - if (irq == -1) + if (irq == NO_IRQ) return -ENODEV; mutex_lock(¬if->mutex); |