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 159/223] drm/panel: simple: Fix panel_simple_dsi_probe
    Date
    [ Upstream commit 7ad9db66fafb0f0ad53fd2a66217105da5ddeffe ]

    In case mipi_dsi_attach() fails remove the registered panel to avoid added
    panel without corresponding device.

    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20190226081153.31334-1-peter.ujfalusi@ti.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/panel/panel-simple.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
    index 5b2a9f97ff04..68a2b25deb50 100644
    --- a/drivers/gpu/drm/panel/panel-simple.c
    +++ b/drivers/gpu/drm/panel/panel-simple.c
    @@ -1944,7 +1944,14 @@ static int panel_simple_dsi_probe(struct mipi_dsi_device *dsi)
    dsi->format = desc->format;
    dsi->lanes = desc->lanes;

    - return mipi_dsi_attach(dsi);
    + err = mipi_dsi_attach(dsi);
    + if (err) {
    + struct panel_simple *panel = dev_get_drvdata(&dsi->dev);
    +
    + drm_panel_remove(&panel->base);
    + }
    +
    + return err;
    }

    static int panel_simple_dsi_remove(struct mipi_dsi_device *dsi)
    --
    2.20.1


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