diff options
Diffstat (limited to 'drivers/input/mousedev.c')
| -rw-r--r-- | drivers/input/mousedev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index a1b4c37956b2..8f02e3d0e712 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
| @@ -523,7 +523,6 @@ static int mousedev_release(struct inode *inode, struct file *file) | |||
| 523 | kfree(client); | 523 | kfree(client); |
| 524 | 524 | ||
| 525 | mousedev_close_device(mousedev); | 525 | mousedev_close_device(mousedev); |
| 526 | put_device(&mousedev->dev); | ||
| 527 | 526 | ||
| 528 | return 0; | 527 | return 0; |
| 529 | } | 528 | } |
| @@ -558,7 +557,6 @@ static int mousedev_open(struct inode *inode, struct file *file) | |||
| 558 | file->private_data = client; | 557 | file->private_data = client; |
| 559 | nonseekable_open(inode, file); | 558 | nonseekable_open(inode, file); |
| 560 | 559 | ||
| 561 | get_device(&mousedev->dev); | ||
| 562 | return 0; | 560 | return 0; |
| 563 | 561 | ||
| 564 | err_free_client: | 562 | err_free_client: |
| @@ -892,6 +890,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev, | |||
| 892 | } | 890 | } |
| 893 | 891 | ||
| 894 | cdev_init(&mousedev->cdev, &mousedev_fops); | 892 | cdev_init(&mousedev->cdev, &mousedev_fops); |
| 893 | mousedev->cdev.kobj.parent = &mousedev->dev.kobj; | ||
| 895 | error = cdev_add(&mousedev->cdev, mousedev->dev.devt, 1); | 894 | error = cdev_add(&mousedev->cdev, mousedev->dev.devt, 1); |
| 896 | if (error) | 895 | if (error) |
| 897 | goto err_unregister_handle; | 896 | goto err_unregister_handle; |
