lkml.org 
[lkml]   [2018]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 148/156] serial: 8250_uniphier: fix error return code in uniphier_uart_probe()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Wei Yongjun <weiyongjun1@huawei.com>

    commit 7defa77d2baca4d6eb85234f10f38ab618332e75 upstream.

    Fix to return a negative error code from the port register error
    handling case instead of 0, as done elsewhere in this function.

    Fixes: 39be40ce066d ("serial: 8250_uniphier: fix serial port index in private data")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/tty/serial/8250/8250_uniphier.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/tty/serial/8250/8250_uniphier.c
    +++ b/drivers/tty/serial/8250/8250_uniphier.c
    @@ -259,12 +259,13 @@ static int uniphier_uart_probe(struct pl
    up.dl_read = uniphier_serial_dl_read;
    up.dl_write = uniphier_serial_dl_write;

    - priv->line = serial8250_register_8250_port(&up);
    - if (priv->line < 0) {
    + ret = serial8250_register_8250_port(&up);
    + if (ret < 0) {
    dev_err(dev, "failed to register 8250 port\n");
    clk_disable_unprepare(priv->clk);
    return ret;
    }
    + priv->line = ret;

    platform_set_drvdata(pdev, priv);


    \
     
     \ /
      Last update: 2018-02-02 18:24    [W:4.082 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site