diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 05:47:46 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 05:47:46 -0500 |
| commit | 41966710ab574f1fcedf3e10e1ceef911c096d1d (patch) | |
| tree | a370f9fb2392267d1e7b06d7c9f43c6d80eb12be /include/sound/initval.h | |
| parent | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (diff) | |
| parent | 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'include/sound/initval.h')
| -rw-r--r-- | include/sound/initval.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/initval.h b/include/sound/initval.h index 1daa6dff8297..f99a0d2ddfe7 100644 --- a/include/sound/initval.h +++ b/include/sound/initval.h | |||
| @@ -62,7 +62,7 @@ static int snd_legacy_find_free_irq(int *irq_table) | |||
| 62 | { | 62 | { |
| 63 | while (*irq_table != -1) { | 63 | while (*irq_table != -1) { |
| 64 | if (!request_irq(*irq_table, snd_legacy_empty_irq_handler, | 64 | if (!request_irq(*irq_table, snd_legacy_empty_irq_handler, |
| 65 | IRQF_DISABLED | IRQF_PROBE_SHARED, "ALSA Test IRQ", | 65 | IRQF_PROBE_SHARED, "ALSA Test IRQ", |
| 66 | (void *) irq_table)) { | 66 | (void *) irq_table)) { |
| 67 | free_irq(*irq_table, (void *) irq_table); | 67 | free_irq(*irq_table, (void *) irq_table); |
| 68 | return *irq_table; | 68 | return *irq_table; |