lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 184/545] drm: bridge: adv7511: Add check for mipi_dsi_driver_register
    Date
    From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

    [ Upstream commit 831463667b5f4f1e5bce9c3b94e9e794d2bc8923 ]

    As mipi_dsi_driver_register could return error if fails,
    it should be better to check the return value and return error
    if fails.
    Moreover, if i2c_add_driver fails, mipi_dsi_driver_register
    should be reverted.

    Fixes: 1e4d58cd7f88 ("drm/bridge: adv7533: Create a MIPI DSI device")
    Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
    Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Link: https://patchwork.freedesktop.org/patch/msgid/20220602103401.2980938-1-jiasheng@iscas.ac.cn
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 ++++++++++++++---
    1 file changed, 14 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
    index 8bac392cab79..430c5e8f0388 100644
    --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
    +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
    @@ -1381,10 +1381,21 @@ static struct i2c_driver adv7511_driver = {

    static int __init adv7511_init(void)
    {
    - if (IS_ENABLED(CONFIG_DRM_MIPI_DSI))
    - mipi_dsi_driver_register(&adv7533_dsi_driver);
    + int ret;
    +
    + if (IS_ENABLED(CONFIG_DRM_MIPI_DSI)) {
    + ret = mipi_dsi_driver_register(&adv7533_dsi_driver);
    + if (ret)
    + return ret;
    + }

    - return i2c_add_driver(&adv7511_driver);
    + ret = i2c_add_driver(&adv7511_driver);
    + if (ret) {
    + if (IS_ENABLED(CONFIG_DRM_MIPI_DSI))
    + mipi_dsi_driver_unregister(&adv7533_dsi_driver);
    + }
    +
    + return ret;
    }
    module_init(adv7511_init);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-19 18:12    [W:4.044 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site