serial: 8250_uniphier: fix serial port index in private data

serial8250_register_8250_port() may allocate a different port index
than requested.  The driver needs to remember the returned value of
serial8250_register_8250_port() for later use.  Otherwise, the .remove
hook may unregister a different port.

Fixes: 1a8d2903cb6a ("serial: 8250_uniphier: add UniPhier serial driver")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c
index 746680ebf90c572b6e01ec3080555454477ac8d8..633ac378b7f26be7e24b43a9de6c7ce560322ba3 100644 (file)
--- a/drivers/tty/serial/8250/8250_uniphier.c
+++ b/drivers/tty/serial/8250/8250_uniphier.c
@@ -169,7 +169,7 @@ static int uniphier_of_serial_setup(struct device *dev, struct uart_port *port,
                dev_err(dev, "failed to get alias id\n");
                return ret;
        }
-       port->line = priv->line = ret;
+       port->line = ret;
 
        /* Get clk rate through clk driver */
        priv->clk = devm_clk_get(dev, NULL);
@@ -249,8 +249,8 @@ static int uniphier_uart_probe(struct platform_device *pdev)
        up.dl_read = uniphier_serial_dl_read;
        up.dl_write = uniphier_serial_dl_write;
 
-       ret = serial8250_register_8250_port(&up);
-       if (ret < 0) {
+       priv->line = serial8250_register_8250_port(&up);
+       if (priv->line < 0) {
                dev_err(dev, "failed to register 8250 port\n");
                clk_disable_unprepare(priv->clk);
                return ret;