diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
| commit | 3e414096429d55fbc8116171bba3487647bbe638 (patch) | |
| tree | 2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /drivers/sound | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'drivers/sound')
| -rw-r--r-- | drivers/sound/i810_audio.c | 7 | ||||
| -rw-r--r-- | drivers/sound/vidc.c | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sound/i810_audio.c b/drivers/sound/i810_audio.c index 1ac21c429..f04636a65 100644 --- a/drivers/sound/i810_audio.c +++ b/drivers/sound/i810_audio.c @@ -1627,12 +1627,11 @@ static int i810_release(struct inode *inode, struct file *file) state->card->free_pcm_channel(state->card, dmabuf->channel->num); } - kfree(state->card->states[state->virt]); - state->card->states[state->virt] = NULL; - state->open_mode &= (~file->f_mode) & (FMODE_READ|FMODE_WRITE); - /* we're covered by the open_sem */ up(&state->open_sem); + + kfree(state->card->states[state->virt]); + state->card->states[state->virt] = NULL; return 0; } diff --git a/drivers/sound/vidc.c b/drivers/sound/vidc.c index 6342e511a..01fb315ab 100644 --- a/drivers/sound/vidc.c +++ b/drivers/sound/vidc.c @@ -22,6 +22,7 @@ #include <asm/dma.h> #include <asm/io.h> #include <asm/iomd.h> +#include <asm/irq.h> #include <asm/system.h> #include "sound_config.h" |