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/telephony | |
| 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/telephony')
| -rw-r--r-- | drivers/telephony/ixj.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 043d57bbc..47485dbde 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c @@ -50,6 +50,7 @@ static char ixj_c_rcsid[] = "$Id: ixj.c,v 3.4 1999/12/16 22:18:36 root Exp root #include <linux/timer.h> #include <linux/delay.h> #include <linux/pci.h> +#include <linux/smp_lock.h> #include <asm/io.h> #include <asm/segment.h> @@ -1056,6 +1057,7 @@ int ixj_release(struct inode *inode, struct file *file_p) if (ixjdebug > 0) printk(KERN_INFO "Closing board %d\n", NUM(inode->i_rdev)); + lock_kernel(); daa_set_mode(board, SOP_PU_SLEEP); ixj_set_port(board, PORT_POTS); aec_stop(board); @@ -1189,6 +1191,7 @@ int ixj_release(struct inode *inode, struct file *file_p) j->rec_frame_size = j->play_frame_size = 0; ixj_fasync(-1, file_p, 0); // remove from list of async notification + unlock_kernel(); return 0; } |