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/es1371.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/es1371.c')
| -rw-r--r-- | sound/oss/es1371.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c index 2562f4769b9..ddf6b0a0bca 100644 --- a/sound/oss/es1371.c +++ b/sound/oss/es1371.c | |||
| @@ -1102,7 +1102,7 @@ static void es1371_handle_midi(struct es1371_state *s) | |||
| 1102 | 1102 | ||
| 1103 | static irqreturn_t es1371_interrupt(int irq, void *dev_id) | 1103 | static irqreturn_t es1371_interrupt(int irq, void *dev_id) |
| 1104 | { | 1104 | { |
| 1105 | struct es1371_state *s = (struct es1371_state *)dev_id; | 1105 | struct es1371_state *s = dev_id; |
| 1106 | unsigned int intsrc, sctl; | 1106 | unsigned int intsrc, sctl; |
| 1107 | 1107 | ||
| 1108 | /* fastpath out, to ease interrupt sharing */ | 1108 | /* fastpath out, to ease interrupt sharing */ |