X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Finput%2Fmousedev.c;h=8f02e3d0e712789dc2cccbb0cb52fe40fc0620db;hb=a7227a0faa117d0bc532aea546ae5ac5f89e8ed7;hp=a1b4c37956b2ef3af055e5c66ccd7753225cabeb;hpb=efec22b4689bbfdbed26367219e981fcc946b9a6;p=~andy%2Flinux

diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index a1b4c37956b..8f02e3d0e71 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)
 	kfree(client);
 
 	mousedev_close_device(mousedev);
-	put_device(&mousedev->dev);
 
 	return 0;
 }
@@ -558,7 +557,6 @@ static int mousedev_open(struct inode *inode, struct file *file)
 	file->private_data = client;
 	nonseekable_open(inode, file);
 
-	get_device(&mousedev->dev);
 	return 0;
 
  err_free_client:
@@ -892,6 +890,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev,
 	}
 
 	cdev_init(&mousedev->cdev, &mousedev_fops);
+	mousedev->cdev.kobj.parent = &mousedev->dev.kobj;
 	error = cdev_add(&mousedev->cdev, mousedev->dev.devt, 1);
 	if (error)
 		goto err_unregister_handle;