diff options
| -rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.c | 9 | ||||
| -rw-r--r-- | drivers/staging/dt3155/dt3155_drv.c | 6 | ||||
| -rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 7 |
3 files changed, 13 insertions, 9 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index 60839690beee..fbb80f09a3d9 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c @@ -15,11 +15,12 @@ along with this driver. If not, see <http://www.gnu.org/licenses/>. ***************************************************************************/ -#include <linux/smp_lock.h> +#include <linux/mutex.h> #include <linux/slab.h> #include "crystalhd_lnx.h" +static DEFINE_MUTEX(chd_dec_mutex); static struct class *crystalhd_class; static struct crystalhd_adp *g_adp_info; @@ -277,16 +278,16 @@ static long chd_dec_ioctl(struct file *fd, unsigned int cmd, unsigned long ua) return -ENODATA; } - lock_kernel(); + mutex_lock(&chd_dec_mutex); cproc = crystalhd_get_cmd_proc(&adp->cmds, cmd, uc); if (!cproc) { BCMLOG_ERR("Unhandled command: %d\n", cmd); - unlock_kernel(); + mutex_unlock(&chd_dec_mutex); return -EINVAL; } ret = chd_dec_api_cmd(adp, ua, uc->uid, cmd, cproc); - unlock_kernel(); + mutex_unlock(&chd_dec_mutex); return ret; } diff --git a/drivers/staging/dt3155/dt3155_drv.c b/drivers/staging/dt3155/dt3155_drv.c index 091eb74b7113..5311cdb01806 100644 --- a/drivers/staging/dt3155/dt3155_drv.c +++ b/drivers/staging/dt3155/dt3155_drv.c @@ -57,6 +57,7 @@ MA 02111-1307 USA #include <linux/module.h> #include <linux/interrupt.h> +#include <linux/mutex.h> #include <linux/pci.h> #include <linux/types.h> #include <linux/poll.h> @@ -76,6 +77,7 @@ MA 02111-1307 USA MODULE_LICENSE("GPL"); /* Error variable. Zero means no error. */ +static DEFINE_MUTEX(dt3155_mutex); int dt3155_errno = 0; #ifndef PCI_DEVICE_ID_INTEL_7116 @@ -827,9 +829,9 @@ dt3155_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int ret; - lock_kernel(); + mutex_lock(&dt3155_mutex); ret = dt3155_ioctl(file->f_path.dentry->d_inode, file, cmd, arg); - unlock_kernel(); + mutex_unlock(&dt3155_mutex); return ret; } diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 326991c7d47b..8f77bd24630c 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -31,7 +31,7 @@ #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/syscalls.h> -#include <linux/smp_lock.h> +#include <linux/mutex.h> #include <linux/types.h> #include <linux/io.h> @@ -40,6 +40,7 @@ #include "../vme.h" #include "vme_user.h" +static DEFINE_MUTEX(vme_user_mutex); static char driver_name[] = "vme_user"; static int bus[USER_BUS_MAX]; @@ -559,9 +560,9 @@ vme_user_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int ret; - lock_kernel(); + mutex_lock(&vme_user_mutex); ret = vme_user_ioctl(file->f_path.dentry->d_inode, file, cmd, arg); - unlock_kernel(); + mutex_unlock(&vme_user_mutex); return ret; } |