Merge branch 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6...

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

diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index c9a02fe..71ef5d6 100644 (file)
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
 
 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
 {
-       static atomic_t serio_raw_no = ATOMIC_INIT(0);
+       static atomic_t serio_raw_no = ATOMIC_INIT(-1);
        struct serio_raw *serio_raw;
        int err;
 
@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
        }
 
        snprintf(serio_raw->name, sizeof(serio_raw->name),
-                "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
+                "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
        kref_init(&serio_raw->kref);
        INIT_LIST_HEAD(&serio_raw->client_list);
        init_waitqueue_head(&serio_raw->wait);