summaryrefslogtreecommitdiff
path: root/sound/oss/i810_audio.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 21:21:45 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 21:21:45 (GMT)
commit5a43c09d1b65da614620b1985633e3251b4f9b99 (patch)
tree3ecbd9dbec12cd023030baa0b1919498fe4e03c9 /sound/oss/i810_audio.c
parent659564c8adfe1765476beee8d55cd18986946892 (diff)
parent5d347c8abaab1e8c24272a53099c22482855783e (diff)
downloadlinux-5a43c09d1b65da614620b1985633e3251b4f9b99.tar.xz
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/i810_audio.c')
-rw-r--r--sound/oss/i810_audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index a48af87..240cc79 100644
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -1525,7 +1525,7 @@ static void i810_channel_interrupt(struct i810_card *card)
static irqreturn_t i810_interrupt(int irq, void *dev_id)
{
- struct i810_card *card = (struct i810_card *)dev_id;
+ struct i810_card *card = dev_id;
u32 status;
spin_lock(&card->lock);