diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 17:21:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 17:21:45 -0400 |
| commit | 5a43c09d1b65da614620b1985633e3251b4f9b99 (patch) | |
| tree | 3ecbd9dbec12cd023030baa0b1919498fe4e03c9 /sound/oss/hal2.c | |
| parent | 659564c8adfe1765476beee8d55cd18986946892 (diff) | |
| parent | 5d347c8abaab1e8c24272a53099c22482855783e (diff) | |
Merge branch 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
drivers/isdn/act2000: kill irq2card_map
drivers/net/eepro: kill dead code
Various drivers' irq handlers: kill dead code, needless casts
drivers/net: eliminate irq handler impossible checks, needless casts
arch/i386/kernel/time: don't shadow 'irq' function arg
Diffstat (limited to 'sound/oss/hal2.c')
| -rw-r--r-- | sound/oss/hal2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/hal2.c b/sound/oss/hal2.c index 7807abac0625..784bdd707055 100644 --- a/sound/oss/hal2.c +++ b/sound/oss/hal2.c | |||
| @@ -372,7 +372,7 @@ static void hal2_adc_interrupt(struct hal2_codec *adc) | |||
| 372 | 372 | ||
| 373 | static irqreturn_t hal2_interrupt(int irq, void *dev_id) | 373 | static irqreturn_t hal2_interrupt(int irq, void *dev_id) |
| 374 | { | 374 | { |
| 375 | struct hal2_card *hal2 = (struct hal2_card*)dev_id; | 375 | struct hal2_card *hal2 = dev_id; |
| 376 | irqreturn_t ret = IRQ_NONE; | 376 | irqreturn_t ret = IRQ_NONE; |
| 377 | 377 | ||
| 378 | /* decide what caused this interrupt */ | 378 | /* decide what caused this interrupt */ |