diff options
| author | Oliver Neukum <oliver@neukum.org> | 2010-01-14 10:11:03 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:54:28 -0500 |
| commit | dbdae3bd4af15c32e3b5eb6e608c1e2ea751b07f (patch) | |
| tree | 3a8a62305f9df15ab368c12eef7bc71851e9ada7 /drivers/usb/misc | |
| parent | 511e2d0218d04f544065eb277ad475bf14881efe (diff) | |
USB: BKL removal: idmouse
BKL was not needed at all. Removed without replacement.
Signed-off-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc')
| -rw-r--r-- | drivers/usb/misc/idmouse.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index 68df9ac76699..a54c3cb804ce 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/completion.h> | 25 | #include <linux/completion.h> |
| 26 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
| 27 | #include <linux/smp_lock.h> | ||
| 28 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
| 29 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
| 30 | 29 | ||
| @@ -227,20 +226,16 @@ static int idmouse_open(struct inode *inode, struct file *file) | |||
| 227 | struct usb_interface *interface; | 226 | struct usb_interface *interface; |
| 228 | int result; | 227 | int result; |
| 229 | 228 | ||
| 230 | lock_kernel(); | ||
| 231 | /* get the interface from minor number and driver information */ | 229 | /* get the interface from minor number and driver information */ |
| 232 | interface = usb_find_interface (&idmouse_driver, iminor (inode)); | 230 | interface = usb_find_interface (&idmouse_driver, iminor (inode)); |
| 233 | if (!interface) { | 231 | if (!interface) |
| 234 | unlock_kernel(); | ||
| 235 | return -ENODEV; | 232 | return -ENODEV; |
| 236 | } | ||
| 237 | 233 | ||
| 238 | mutex_lock(&open_disc_mutex); | 234 | mutex_lock(&open_disc_mutex); |
| 239 | /* get the device information block from the interface */ | 235 | /* get the device information block from the interface */ |
| 240 | dev = usb_get_intfdata(interface); | 236 | dev = usb_get_intfdata(interface); |
| 241 | if (!dev) { | 237 | if (!dev) { |
| 242 | mutex_unlock(&open_disc_mutex); | 238 | mutex_unlock(&open_disc_mutex); |
| 243 | unlock_kernel(); | ||
| 244 | return -ENODEV; | 239 | return -ENODEV; |
| 245 | } | 240 | } |
| 246 | 241 | ||
| @@ -277,7 +272,6 @@ error: | |||
| 277 | 272 | ||
| 278 | /* unlock this device */ | 273 | /* unlock this device */ |
| 279 | mutex_unlock(&dev->lock); | 274 | mutex_unlock(&dev->lock); |
| 280 | unlock_kernel(); | ||
| 281 | return result; | 275 | return result; |
| 282 | } | 276 | } |
| 283 | 277 | ||
