Merge branch 'timecounter'

[cascardo/linux.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 0f175f5..04217c2 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
  */
 struct input_dev *input_allocate_device(void)
 {
-       static atomic_t input_no = ATOMIC_INIT(0);
+       static atomic_t input_no = ATOMIC_INIT(-1);
        struct input_dev *dev;
 
        dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
@@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
                INIT_LIST_HEAD(&dev->node);
 
                dev_set_name(&dev->dev, "input%lu",
-                            (unsigned long) atomic_inc_return(&input_no) - 1);
+                            (unsigned long)atomic_inc_return(&input_no));
 
                __module_get(THIS_MODULE);
        }