| From 9f53c27b8f0195d5cd484a5e1a1bf83389740a12 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 |
| |
| commit 57177d214ee0816c4436c23d6c933ccb32c571f1 upstream. |
| |
| 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 |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c |
| index 9c3f99339b82..9f037095b506 100644 |
| --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c |
| +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c |
| @@ -681,8 +681,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.7.4 |
| |
