summaryrefslogtreecommitdiffstats
path: root/sound/oss/es1371.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 23:21:45 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 23:21:45 +0200
commit5a43c09d1b65da614620b1985633e3251b4f9b99 (patch)
tree3ecbd9dbec12cd023030baa0b1919498fe4e03c9 /sound/oss/es1371.c
parent[PATCH] Introduce vfs_listxattr (diff)
parentMerge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups (diff)
downloadlinux-5a43c09d1b65da614620b1985633e3251b4f9b99.tar.xz
linux-5a43c09d1b65da614620b1985633e3251b4f9b99.zip
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index 2562f4769b90..ddf6b0a0bca5 100644
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -1102,7 +1102,7 @@ static void es1371_handle_midi(struct es1371_state *s)
static irqreturn_t es1371_interrupt(int irq, void *dev_id)
{
- struct es1371_state *s = (struct es1371_state *)dev_id;
+ struct es1371_state *s = dev_id;
unsigned int intsrc, sctl;
/* fastpath out, to ease interrupt sharing */