diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
| commit | f1da2c3860e301527d56a1ef0b56c649ee7c4b1b (patch) | |
| tree | 562b5d2e8b9cb62eb983d78ff6bcf9789e08fcf6 /drivers/sbus/audio/audio.c | |
| parent | 00f11569ac8ca73cbcdef8822de1583e79aee571 (diff) | |
Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.
The IP22 cache bugs which are plaguing some machines are still unfixed.
Diffstat (limited to 'drivers/sbus/audio/audio.c')
| -rw-r--r-- | drivers/sbus/audio/audio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/sbus/audio/audio.c b/drivers/sbus/audio/audio.c index be7e9de06..6ee5c6d3c 100644 --- a/drivers/sbus/audio/audio.c +++ b/drivers/sbus/audio/audio.c @@ -24,6 +24,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/sched.h> +#include <linux/smp_lock.h> #include <linux/mm.h> #include <linux/tqueue.h> #include <linux/major.h> @@ -1910,6 +1911,7 @@ static int sparcaudio_release(struct inode * inode, struct file * file) struct sparcaudio_driver *drv = drivers[(MINOR(inode->i_rdev) >> SPARCAUDIO_DEVICE_SHIFT)]; + lock_kernel(); if (file->f_mode & FMODE_READ) { /* Stop input */ drv->ops->stop_input(drv); @@ -1951,11 +1953,13 @@ static int sparcaudio_release(struct inode * inode, struct file * file) kill_procs(drv->sd_siglist,SIGPOLL,S_MSG); wake_up_interruptible(&drv->open_wait); + unlock_kernel(); return 0; } static struct file_operations sparcaudio_fops = { + owner: THIS_MODULE, llseek: sparcaudio_lseek, read: sparcaudio_read, write: sparcaudio_write, |