summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2023-08-06 09:20:50 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-09 15:12:43 +0300
commita4a79e03bab57729bd8046d22bf3666912e586fb (patch)
treeb8f2949236aa4fea19c181e35ea9b756c3312b49 /drivers/tty
parent3f29d9ee323ae5cda59d144d1f8b0b10ea065be0 (diff)
downloadlinux-a4a79e03bab57729bd8046d22bf3666912e586fb.tar.xz
serial: core: Revert port_id use
Guenter reports boot issues with duplicate sysfs entries for multiport drivers. Let's go back to using port->line for now to fix the regression. With this change, the serial core port device names are not correct for the hardware specific 8250 single port drivers, but that's a cosmetic issue for now. Fixes: d962de6ae51f ("serial: core: Fix serial core port id to not use port->line") Reported-by: Guenter Roeck <groeck7@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Tested-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20230806062052.47737-1-tony@atomide.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/serial_base_bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c
index e95c68825d2f..e446c57e845a 100644
--- a/drivers/tty/serial/serial_base_bus.c
+++ b/drivers/tty/serial/serial_base_bus.c
@@ -151,7 +151,7 @@ struct serial_port_device *serial_base_port_add(struct uart_port *port,
err = serial_base_device_init(port, &port_dev->dev,
&ctrl_dev->dev, &serial_port_type,
serial_base_port_release,
- port->ctrl_id, port->port_id);
+ port->ctrl_id, port->line);
if (err)
goto err_put_device;