lkml.org 
[lkml]   [2022]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 23/49] staging: fbtft: Fix error path in fbtft_driver_module_init()
    Date
    From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

    [ Upstream commit 426aca16e903b387a0b0001d62207a745c67cfd3 ]

    If registering the platform driver fails, the function must not return
    without undoing the spi driver registration first.

    Fixes: c296d5f9957c ("staging: fbtft: core support")
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Link: https://lore.kernel.org/r/20220118181338.207943-1-u.kleine-koenig@pengutronix.de
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/fbtft/fbtft.h | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
    index 798a8fe98e957..247d0c23bb753 100644
    --- a/drivers/staging/fbtft/fbtft.h
    +++ b/drivers/staging/fbtft/fbtft.h
    @@ -332,7 +332,10 @@ static int __init fbtft_driver_module_init(void) \
    ret = spi_register_driver(&fbtft_driver_spi_driver); \
    if (ret < 0) \
    return ret; \
    - return platform_driver_register(&fbtft_driver_platform_driver); \
    + ret = platform_driver_register(&fbtft_driver_platform_driver); \
    + if (ret < 0) \
    + spi_unregister_driver(&fbtft_driver_spi_driver); \
    + return ret; \
    } \
    \
    static void __exit fbtft_driver_module_exit(void) \
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-02-14 10:40    [W:3.996 / U:2.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site