diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /kernel/irq/manage.c | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
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.... |