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/isa/gus/interwave.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/isa/gus/interwave.c')
-rw-r--r-- | sound/isa/gus/interwave.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index 5c474b831edc..f12cd09d1fcc 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c | |||
@@ -301,7 +301,7 @@ static int __devinit snd_interwave_detect(struct snd_interwave *iwcard, | |||
301 | 301 | ||
302 | static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id) | 302 | static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id) |
303 | { | 303 | { |
304 | struct snd_interwave *iwcard = (struct snd_interwave *) dev_id; | 304 | struct snd_interwave *iwcard = dev_id; |
305 | int loop, max = 5; | 305 | int loop, max = 5; |
306 | int handled = 0; | 306 | int handled = 0; |
307 | 307 | ||