mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 86e1177c43aeee7681a1cd51ed1c7c2bae870d55 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 31 Mar 2022 12:03:36 +0100
|
|
Subject: [PATCH 0361/1002] drm/panel: ilitek-ili9881c: Clean up on
|
|
mipi_dsi_attach failure
|
|
|
|
mipi_dsi_attach is allowed to fail, and currently the probe
|
|
code doesn't clean up (mainly drm_panel_remove) if this happens.
|
|
|
|
Add cleanup code on failure.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
|
|
index aaaf3540ae31..e4e3cbbc157f 100644
|
|
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
|
|
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
|
|
@@ -1345,7 +1345,11 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)
|
|
dsi->format = MIPI_DSI_FMT_RGB888;
|
|
dsi->lanes = 4;
|
|
|
|
- return mipi_dsi_attach(dsi);
|
|
+ ret = mipi_dsi_attach(dsi);
|
|
+ if (ret)
|
|
+ drm_panel_remove(&ctx->panel);
|
|
+
|
|
+ return ret;
|
|
}
|
|
|
|
static void ili9881c_dsi_remove(struct mipi_dsi_device *dsi)
|
|
--
|
|
2.44.0
|
|
|