diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
| commit | de8853bc38ceab1fa7e7f723b21430d4aad60fea (patch) | |
| tree | 5084ef51866fd1767324f8dc8eb36e97c55350f5 /kernel/irq/manage.c | |
| parent | f5de24b06aa46427500d0fdbe8616b73a71d8c28 (diff) | |
| parent | 440b004cf953bec2bc8cd91c64ae707fd7e25327 (diff) | |
Merge remote branch 'alsa/fixes' into fix/hda
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index bde4c667d24d..7305b297d1eb 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -1067,7 +1067,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, | |||
| 1067 | kfree(action); | 1067 | kfree(action); |
| 1068 | 1068 | ||
| 1069 | #ifdef CONFIG_DEBUG_SHIRQ | 1069 | #ifdef CONFIG_DEBUG_SHIRQ |
| 1070 | if (irqflags & IRQF_SHARED) { | 1070 | if (!retval && (irqflags & IRQF_SHARED)) { |
| 1071 | /* | 1071 | /* |
| 1072 | * It's a shared IRQ -- the driver ought to be prepared for it | 1072 | * It's a shared IRQ -- the driver ought to be prepared for it |
| 1073 | * to happen immediately, so let's make sure.... | 1073 | * to happen immediately, so let's make sure.... |