diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
| commit | 5d347c8abaab1e8c24272a53099c22482855783e (patch) | |
| tree | 3e267ced787b4ae18dd2c6275c1b8a83884f96b6 /sound/oss/es1371.c | |
| parent | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff) | |
| parent | d87dbede030d17770aa6a6170e70ab6f8044e5ae (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.c | 2 |
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) | |||
| 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 */ |