diff --git a/[refs] b/[refs] index 40ae2db913f2..8cc7ccd996d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66e66118837ed95a299328437c2d9fb4b5137352 +refs/heads/master: 655816e49867082d13ece0da31d76e12cc0de4a5 diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c index 4954c790ccb1..f2c85a60a0dc 100644 --- a/trunk/drivers/input/input.c +++ b/trunk/drivers/input/input.c @@ -912,6 +912,8 @@ struct input_dev *input_allocate_device(void) mutex_init(&dev->mutex); INIT_LIST_HEAD(&dev->h_list); INIT_LIST_HEAD(&dev->node); + + __module_get(THIS_MODULE); } return dev; @@ -985,8 +987,6 @@ int input_register_device(struct input_dev *dev) if (error) goto fail3; - __module_get(THIS_MODULE); - path = kobject_get_path(&dev->cdev.kobj, GFP_KERNEL); printk(KERN_INFO "input: %s as %s\n", dev->name ? dev->name : "Unspecified device", path ? path : "N/A");