diff options
Diffstat (limited to 'drivers/input/mousedev.c')
-rw-r--r-- | drivers/input/mousedev.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 0110b5a3a167..964e43d81e29 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
@@ -551,17 +551,16 @@ static int mousedev_open(struct inode *inode, struct file *file) | |||
551 | return -ENODEV; | 551 | return -ENODEV; |
552 | 552 | ||
553 | error = mutex_lock_interruptible(&mousedev_table_mutex); | 553 | error = mutex_lock_interruptible(&mousedev_table_mutex); |
554 | if (error) { | 554 | if (error) |
555 | return error; | 555 | return error; |
556 | } | 556 | |
557 | mousedev = mousedev_table[i]; | 557 | mousedev = mousedev_table[i]; |
558 | if (mousedev) | 558 | if (mousedev) |
559 | get_device(&mousedev->dev); | 559 | get_device(&mousedev->dev); |
560 | mutex_unlock(&mousedev_table_mutex); | 560 | mutex_unlock(&mousedev_table_mutex); |
561 | 561 | ||
562 | if (!mousedev) { | 562 | if (!mousedev) |
563 | return -ENODEV; | 563 | return -ENODEV; |
564 | } | ||
565 | 564 | ||
566 | client = kzalloc(sizeof(struct mousedev_client), GFP_KERNEL); | 565 | client = kzalloc(sizeof(struct mousedev_client), GFP_KERNEL); |
567 | if (!client) { | 566 | if (!client) { |
@@ -1088,7 +1087,7 @@ static int __init mousedev_init(void) | |||
1088 | #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX | 1087 | #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX |
1089 | error = misc_register(&psaux_mouse); | 1088 | error = misc_register(&psaux_mouse); |
1090 | if (error) | 1089 | if (error) |
1091 | pr_warning("could not register psaux device, error: %d\n", | 1090 | pr_warn("could not register psaux device, error: %d\n", |
1092 | error); | 1091 | error); |
1093 | else | 1092 | else |
1094 | psaux_registered = 1; | 1093 | psaux_registered = 1; |