summaryrefslogtreecommitdiffstats
path: root/sound/oss/es1371.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-06 15:27:31 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-06 15:27:31 -0400
commit5d347c8abaab1e8c24272a53099c22482855783e (patch)
tree3e267ced787b4ae18dd2c6275c1b8a83884f96b6 /sound/oss/es1371.c
parente317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff)
parentd87dbede030d17770aa6a6170e70ab6f8044e5ae (diff)
Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups
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 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)
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 */