merge linus into release branch

Conflicts:

	drivers/acpi/acpi_memhotplug.c

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/input/input.c b/drivers/input/input.c
index de2e7546b491..a90486f5e491 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -998,12 +998,13 @@ void input_unregister_device(struct input_dev *dev)
         sysfs_remove_group(&dev->cdev.kobj, &input_dev_caps_attr_group);
         sysfs_remove_group(&dev->cdev.kobj, &input_dev_id_attr_group);
         sysfs_remove_group(&dev->cdev.kobj, &input_dev_attr_group);
-        class_device_unregister(&dev->cdev);
 
         mutex_lock(&dev->mutex);
         dev->name = dev->phys = dev->uniq = NULL;
         mutex_unlock(&dev->mutex);
 
+        class_device_unregister(&dev->cdev);
+
         input_wakeup_procfs_readers();
 }
 EXPORT_SYMBOL(input_unregister_device);