diff options
-rw-r--r-- | drivers/tty/serial/serial_base_bus.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c index 9de9f6fa6481..6ff59c89d867 100644 --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -50,17 +50,17 @@ static int serial_base_device_init(struct uart_port *port, void (*release)(struct device *dev), int id) { - if (!serial_base_initialized) { - dev_err(port->dev, "uart_add_one_port() called before arch_initcall()?\n"); - return -EPROBE_DEFER; - } - device_initialize(dev); dev->type = type; dev->parent = parent_dev; dev->bus = &serial_base_bus_type; dev->release = release; + if (!serial_base_initialized) { + dev_dbg(port->dev, "uart_add_one_port() called before arch_initcall()?\n"); + return -EPROBE_DEFER; + } + return dev_set_name(dev, "%s.%s.%d", type->name, dev_name(port->dev), id); } |