2 files changed, 6 insertions, 0 deletions

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 86b27079004a..173c2861ec58 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1079,6 +1079,9 @@ int input_register_device(struct input_dev *dev)
         snprintf(dev->cdev.class_id, sizeof(dev->cdev.class_id),
                  "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);
 
+        if (!dev->cdev.dev)
+                dev->cdev.dev = dev->dev.parent;
+
         error = class_device_add(&dev->cdev);
         if (error)
                 return error;
diff --git a/include/linux/input.h b/include/linux/input.h
index d0bea9755186..7b6d7c408b07 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -972,6 +972,9 @@ struct input_dev {
         unsigned int users;
 
         struct class_device cdev;
+        union {                 /* temporarily so while we switching to struct device */
+                struct device *parent;
+        } dev;
 
         struct list_head        h_list;
         struct list_head        node;