Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

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

diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 2f12d60..bc03325 100644 (file)
--- 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) {