aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/vme/devices/vme_user.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index 8b1f53331433..87318386034b 100644
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -41,7 +41,6 @@
41 41
42#include "vme_user.h" 42#include "vme_user.h"
43 43
44static DEFINE_MUTEX(vme_user_mutex);
45static const char driver_name[] = "vme_user"; 44static const char driver_name[] = "vme_user";
46 45
47static int bus[VME_USER_BUS_MAX]; 46static int bus[VME_USER_BUS_MAX];
@@ -555,10 +554,12 @@ static long
555vme_user_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 554vme_user_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
556{ 555{
557 int ret; 556 int ret;
557 struct inode *inode = file_inode(file);
558 unsigned int minor = MINOR(inode->i_rdev);
558 559
559 mutex_lock(&vme_user_mutex); 560 mutex_lock(&image[minor].mutex);
560 ret = vme_user_ioctl(file_inode(file), file, cmd, arg); 561 ret = vme_user_ioctl(inode, file, cmd, arg);
561 mutex_unlock(&vme_user_mutex); 562 mutex_unlock(&image[minor].mutex);
562 563
563 return ret; 564 return ret;
564} 565}