diff options
| author | Peter Ujfalusi | 2019-02-26 09:11:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-31 07:26:56 +0200 |
| commit | 586946ce83e4fb55c08381c6715fa743b2801363 (patch) | |
| tree | 1c30cb4b78f2f67eeae7c6aad1a3c8c797e6f281 /drivers/gpu/drm/panel | |
| parent | hvsock: fix epollout hang from race condition (diff) | |
| download | kernel-qcow2-linux-586946ce83e4fb55c08381c6715fa743b2801363.tar.gz kernel-qcow2-linux-586946ce83e4fb55c08381c6715fa743b2801363.tar.xz kernel-qcow2-linux-586946ce83e4fb55c08381c6715fa743b2801363.zip | |
drm/panel: simple: Fix panel_simple_dsi_probe
[ 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>
Diffstat (limited to 'drivers/gpu/drm/panel')
| -rw-r--r-- | drivers/gpu/drm/panel/panel-simple.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 97964f7f2ace..b1d41c4921dd 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -2803,7 +2803,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) |