aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2014-10-08 18:21:32 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-09 18:27:25 -0400
commit0224ec9e9f111b1c39ec00a10de4858061b4afea (patch)
tree11aacc1dc06c5d2f3eff3cc812e777c5418938bd
parentbf1d50fa74df0339c925aa7e2ff9de60a42c30be (diff)
Input: serio - avoid negative serio device numbers
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>
-rw-r--r--drivers/input/serio/serio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index b29134de983b..d399b8b0f000 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -524,8 +524,8 @@ static void serio_init_port(struct serio *serio)
524 spin_lock_init(&serio->lock); 524 spin_lock_init(&serio->lock);
525 mutex_init(&serio->drv_mutex); 525 mutex_init(&serio->drv_mutex);
526 device_initialize(&serio->dev); 526 device_initialize(&serio->dev);
527 dev_set_name(&serio->dev, "serio%ld", 527 dev_set_name(&serio->dev, "serio%lu",
528 (long)atomic_inc_return(&serio_no) - 1); 528 (unsigned long)atomic_inc_return(&serio_no) - 1);
529 serio->dev.bus = &serio_bus; 529 serio->dev.bus = &serio_bus;
530 serio->dev.release = serio_release_port; 530 serio->dev.release = serio_release_port;
531 serio->dev.groups = serio_device_attr_groups; 531 serio->dev.groups = serio_device_attr_groups;