diff options
Diffstat (limited to 'drivers/telephony')
-rw-r--r-- | drivers/telephony/ixj.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index b53deee25d74..b1e469983b1d 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
@@ -257,7 +257,7 @@ | |||
257 | #include <linux/fs.h> /* everything... */ | 257 | #include <linux/fs.h> /* everything... */ |
258 | #include <linux/errno.h> /* error codes */ | 258 | #include <linux/errno.h> /* error codes */ |
259 | #include <linux/slab.h> | 259 | #include <linux/slab.h> |
260 | #include <linux/smp_lock.h> | 260 | #include <linux/mutex.h> |
261 | #include <linux/mm.h> | 261 | #include <linux/mm.h> |
262 | #include <linux/ioport.h> | 262 | #include <linux/ioport.h> |
263 | #include <linux/interrupt.h> | 263 | #include <linux/interrupt.h> |
@@ -277,6 +277,7 @@ | |||
277 | #define TYPE(inode) (iminor(inode) >> 4) | 277 | #define TYPE(inode) (iminor(inode) >> 4) |
278 | #define NUM(inode) (iminor(inode) & 0xf) | 278 | #define NUM(inode) (iminor(inode) & 0xf) |
279 | 279 | ||
280 | static DEFINE_MUTEX(ixj_mutex); | ||
280 | static int ixjdebug; | 281 | static int ixjdebug; |
281 | static int hertz = HZ; | 282 | static int hertz = HZ; |
282 | static int samplerate = 100; | 283 | static int samplerate = 100; |
@@ -6655,9 +6656,9 @@ static long do_ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long ar | |||
6655 | static long ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long arg) | 6656 | static long ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long arg) |
6656 | { | 6657 | { |
6657 | long ret; | 6658 | long ret; |
6658 | lock_kernel(); | 6659 | mutex_lock(&ixj_mutex); |
6659 | ret = do_ixj_ioctl(file_p, cmd, arg); | 6660 | ret = do_ixj_ioctl(file_p, cmd, arg); |
6660 | unlock_kernel(); | 6661 | mutex_unlock(&ixj_mutex); |
6661 | return ret; | 6662 | return ret; |
6662 | } | 6663 | } |
6663 | 6664 | ||