2014-10-08 21:54:36

by Richard Leitner

Subject: [PATCH] serio: avoid negative serio device numbers

From: Richard Leitner <[email protected]>

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 <[email protected]>
---
drivers/input/serio/serio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index b29134d..d399b8b 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)
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;
--
2.1.1

2014-10-08 22:22:12

by Dmitry Torokhov

Subject: Re: [PATCH] serio: avoid negative serio device numbers

On Wed, Oct 08, 2014 at 11:54:27PM +0200, Richard Leitner wrote:
> From: Richard Leitner <[email protected]>
>
> 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 <[email protected]>

Applied, thank you.

> ---
> drivers/input/serio/serio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
> index b29134d..d399b8b 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)
> 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;
> --
> 2.1.1
>

--
Dmitry