lkml.org 
[lkml]   [2021]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 091/177] serial: max310x: unregister uart driver in case of failure and abort
    Date
    From: Atul Gopinathan <atulgopinathan@gmail.com>

    [ Upstream commit 3890e3dea315f1a257d1b940a2a4e2fa16a7b095 ]

    The macro "spi_register_driver" invokes the function
    "__spi_register_driver()" which has a return type of int and can fail,
    returning a negative value in such a case. This is currently ignored and
    the init() function yields success even if the spi driver failed to
    register.

    Fix this by collecting the return value of "__spi_register_driver()" and
    also unregister the uart driver in case of failure.

    Cc: Jiri Slaby <jirislaby@kernel.org>
    Signed-off-by: Atul Gopinathan <atulgopinathan@gmail.com>
    Link: https://lore.kernel.org/r/20210503115736.2104747-12-gregkh@linuxfoundation.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/tty/serial/max310x.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
    index f60b7b86d099..5bf8dd6198bb 100644
    --- a/drivers/tty/serial/max310x.c
    +++ b/drivers/tty/serial/max310x.c
    @@ -1527,10 +1527,12 @@ static int __init max310x_uart_init(void)
    return ret;

    #ifdef CONFIG_SPI_MASTER
    - spi_register_driver(&max310x_spi_driver);
    + ret = spi_register_driver(&max310x_spi_driver);
    + if (ret)
    + uart_unregister_driver(&max310x_uart);
    #endif

    - return 0;
    + return ret;
    }
    module_init(max310x_uart_init);

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-31 17:44    [W:4.087 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site