Pull bugzilla-3241 into release branch

[linux-2.6-omap-h63xx.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index de2e7546b491a8878da0677fc40694ec4ba99b3e..a90486f5e49127bf3bbae494d8502d86835f412c 100644 (file)
--- 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);