]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Input: serio - avoid negative serio device numbers
authorRichard Leitner <richard.leitner@skidata.com>
Wed, 8 Oct 2014 22:21:32 +0000 (15:21 -0700)
committerJiri Slaby <jslaby@suse.cz>
Thu, 13 Nov 2014 18:02:03 +0000 (19:02 +0100)
commit 0224ec9e9f111b1c39ec00a10de4858061b4afea upstream.

Fix the format string for serio device name generation to avoid negative
device numbers when the id exceeds the maximum signed integer value.

Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/input/serio/serio.c

index 2b56855c2c773d2f47ec0ab57e147a761092b39b..de019ebb7e29a9a1a46454eb135f0c9971d3849d 100644 (file)
@@ -506,8 +506,8 @@ static void serio_init_port(struct serio *serio)
        spin_lock_init(&serio->lock);
        mutex_init(&serio->drv_mutex);
        device_initialize(&serio->dev);
-       dev_set_name(&serio->dev, "serio%ld",
-                       (long)atomic_inc_return(&serio_no) - 1);
+       dev_set_name(&serio->dev, "serio%lu",
+                    (unsigned long)atomic_inc_return(&serio_no) - 1);
        serio->dev.bus = &serio_bus;
        serio->dev.release = serio_release_port;
        serio->dev.groups = serio_device_attr_groups;