diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 10:10:06 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 10:10:06 +0100 |
| commit | 1dd3294677d5484e4813c6c454ba7f192a3ef61d (patch) | |
| tree | e29306ffe8b709a7499a25ecbe3234f833fc7002 /drivers/input/serio/serio.c | |
| parent | Linux 2.6.28 (diff) | |
| parent | Input: gtco - use USB endpoint API (diff) | |
| download | linux-1dd3294677d5484e4813c6c454ba7f192a3ef61d.tar.xz linux-1dd3294677d5484e4813c6c454ba7f192a3ef61d.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/serio/serio.c')
| -rw-r--r-- | drivers/input/serio/serio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 2f12d60eee3b..bc033250dfcd 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -546,8 +546,8 @@ static void serio_init_port(struct serio *serio) spin_lock_init(&serio->lock); mutex_init(&serio->drv_mutex); device_initialize(&serio->dev); - snprintf(serio->dev.bus_id, sizeof(serio->dev.bus_id), - "serio%ld", (long)atomic_inc_return(&serio_no) - 1); + dev_set_name(&serio->dev, "serio%ld", + (long)atomic_inc_return(&serio_no) - 1); serio->dev.bus = &serio_bus; serio->dev.release = serio_release_port; if (serio->parent) { |