lkml.org 
[lkml]   [2019]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 167/223] tty/serial: digicolor: Fix digicolor-usart already registered warning
    Date
    [ Upstream commit c7ad9ba0611c53cfe194223db02e3bca015f0674 ]

    When modprobe/rmmod/modprobe module, if platform_driver_register() fails,
    the kernel complained,

    proc_dir_entry 'driver/digicolor-usart' already registered
    WARNING: CPU: 1 PID: 5636 at fs/proc/generic.c:360 proc_register+0x19d/0x270

    Fix this by adding uart_unregister_driver() when platform_driver_register() fails.

    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
    Acked-by: Baruch Siach <baruch@tkos.co.il>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/tty/serial/digicolor-usart.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/tty/serial/digicolor-usart.c b/drivers/tty/serial/digicolor-usart.c
    index 02ad6953b167..50ec5f1ac77f 100644
    --- a/drivers/tty/serial/digicolor-usart.c
    +++ b/drivers/tty/serial/digicolor-usart.c
    @@ -545,7 +545,11 @@ static int __init digicolor_uart_init(void)
    if (ret)
    return ret;

    - return platform_driver_register(&digicolor_uart_platform);
    + ret = platform_driver_register(&digicolor_uart_platform);
    + if (ret)
    + uart_unregister_driver(&digicolor_uart);
    +
    + return ret;
    }
    module_init(digicolor_uart_init);

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-08-02 12:09    [W:4.321 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site