mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-05 17:07:49 +00:00
linux (Allwinner): fix patch
This commit is contained in:
parent
e4a9e74817
commit
3292d149a5
@ -1502,43 +1502,6 @@ index a5757b11b730..5ae67d526b1d 100644
|
|||||||
--
|
--
|
||||||
2.24.1
|
2.24.1
|
||||||
|
|
||||||
From 57177d214ee0816c4436c23d6c933ccb32c571f1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stefan Mavrodiev <stefan@olimex.com>
|
|
||||||
Date: Tue, 17 Dec 2019 14:46:32 +0200
|
|
||||||
Subject: [PATCH] drm/sun4i: hdmi: Remove duplicate cleanup calls
|
|
||||||
|
|
||||||
When the HDMI unbinds drm_connector_cleanup() and drm_encoder_cleanup()
|
|
||||||
are called. This also happens when the connector and the encoder are
|
|
||||||
destroyed. This double call triggers a NULL pointer exception.
|
|
||||||
|
|
||||||
The patch fixes this by removing the cleanup calls in the unbind
|
|
||||||
function.
|
|
||||||
|
|
||||||
Cc: <stable@vger.kernel.org>
|
|
||||||
Fixes: 9c5681011a0c ("drm/sun4i: Add HDMI support")
|
|
||||||
Signed-off-by: Stefan Mavrodiev <stefan@olimex.com>
|
|
||||||
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
||||||
Link: https://patchwork.freedesktop.org/patch/msgid/20191217124632.20820-1-stefan@olimex.com
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
|
|
||||||
index a7c4654445c7..68d4644ac2dc 100644
|
|
||||||
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
|
|
||||||
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
|
|
||||||
@@ -685,8 +685,6 @@ static void sun4i_hdmi_unbind(struct device *dev, struct device *master,
|
|
||||||
struct sun4i_hdmi *hdmi = dev_get_drvdata(dev);
|
|
||||||
|
|
||||||
cec_unregister_adapter(hdmi->cec_adap);
|
|
||||||
- drm_connector_cleanup(&hdmi->connector);
|
|
||||||
- drm_encoder_cleanup(&hdmi->encoder);
|
|
||||||
i2c_del_adapter(hdmi->i2c);
|
|
||||||
i2c_put_adapter(hdmi->ddc_i2c);
|
|
||||||
clk_disable_unprepare(hdmi->mod_clk);
|
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
||||||
From a7fe985633f927401037d2905df2c9701dff09a1 Mon Sep 17 00:00:00 2001
|
From a7fe985633f927401037d2905df2c9701dff09a1 Mon Sep 17 00:00:00 2001
|
||||||
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||||
Date: Sun, 24 Nov 2019 18:29:03 +0100
|
Date: Sun, 24 Nov 2019 18:29:03 +0100
|
||||||
|
Loading…
x
Reference in New Issue
Block a user