aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/frontier/alphatrack.c3
-rw-r--r--drivers/staging/frontier/tranzport.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index e2f82f0dbad..15aed87fe1b 100644
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -41,7 +41,6 @@
#include <linux/mutex.h>
#include <linux/uaccess.h>
-#include <linux/smp_lock.h>
#include <linux/input.h>
#include <linux/usb.h>
#include <linux/poll.h>
@@ -326,7 +325,6 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file)
int retval = 0;
struct usb_interface *interface;
- lock_kernel();
nonseekable_open(inode, file);
subminor = iminor(inode);
@@ -396,7 +394,6 @@ unlock_exit:
unlock_disconnect_exit:
mutex_unlock(&disconnect_mutex);
- unlock_kernel();
return retval;
}
diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c
index 1d3f7dc90f4..ef8fcc8c67b 100644
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
@@ -40,7 +40,6 @@
#include <linux/mutex.h>
#include <linux/uaccess.h>
-#include <linux/smp_lock.h>
#include <linux/input.h>
#include <linux/usb.h>
#include <linux/poll.h>
@@ -344,7 +343,6 @@ static int usb_tranzport_open(struct inode *inode, struct file *file)
int retval = 0;
struct usb_interface *interface;
- lock_kernel();
nonseekable_open(inode, file);
subminor = iminor(inode);
@@ -415,7 +413,6 @@ unlock_exit:
unlock_disconnect_exit:
mutex_unlock(&disconnect_mutex);
- unlock_kernel();
return retval;
}