diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/misc/idmouse.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index c9418535bef8..15c70bd048c4 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
@@ -269,7 +269,7 @@ static int idmouse_release(struct inode *inode, struct file *file) | |||
269 | /* prevent a race condition with open() */ | 269 | /* prevent a race condition with open() */ |
270 | mutex_lock(&disconnect_mutex); | 270 | mutex_lock(&disconnect_mutex); |
271 | 271 | ||
272 | dev = (struct usb_idmouse *) file->private_data; | 272 | dev = file->private_data; |
273 | 273 | ||
274 | if (dev == NULL) { | 274 | if (dev == NULL) { |
275 | mutex_unlock(&disconnect_mutex); | 275 | mutex_unlock(&disconnect_mutex); |
@@ -304,17 +304,15 @@ static int idmouse_release(struct inode *inode, struct file *file) | |||
304 | static ssize_t idmouse_read(struct file *file, char __user *buffer, size_t count, | 304 | static ssize_t idmouse_read(struct file *file, char __user *buffer, size_t count, |
305 | loff_t * ppos) | 305 | loff_t * ppos) |
306 | { | 306 | { |
307 | struct usb_idmouse *dev; | 307 | struct usb_idmouse *dev = file->private_data; |
308 | int result; | 308 | int result; |
309 | 309 | ||
310 | dev = (struct usb_idmouse *) file->private_data; | ||
311 | |||
312 | /* lock this object */ | 310 | /* lock this object */ |
313 | down (&dev->sem); | 311 | down(&dev->sem); |
314 | 312 | ||
315 | /* verify that the device wasn't unplugged */ | 313 | /* verify that the device wasn't unplugged */ |
316 | if (!dev->present) { | 314 | if (!dev->present) { |
317 | up (&dev->sem); | 315 | up(&dev->sem); |
318 | return -ENODEV; | 316 | return -ENODEV; |
319 | } | 317 | } |
320 | 318 | ||