diff options
| author | Stefan Mavrodiev <stefan@olimex.com> | 2019-12-17 13:46:32 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2019-12-18 23:17:32 +0100 |
| commit | 57177d214ee0816c4436c23d6c933ccb32c571f1 (patch) | |
| tree | 734142c5d7588dcf19120fd10184572d84ffbe33 | |
| parent | Merge tag 'drm-fixes-5.5-2019-12-12' of git://people.freedesktop.org/~agd5f/l... (diff) | |
| download | linux-57177d214ee0816c4436c23d6c933ccb32c571f1.tar.xz linux-57177d214ee0816c4436c23d6c933ccb32c571f1.zip | |
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
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 |
1 files changed, 0 insertions, 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); |