| From 3623f8536c05339c10b55ee13d703c6ac7085332 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 6 Aug 2018 08:19:09 +0200 |
| Subject: drm/sti: do not remove the drm_bridge that was never added |
| |
| From: Peter Rosin <peda@axentia.se> |
| |
| [ Upstream commit 66e31a72dc38543b2d9d1ce267dc78ba9beebcfd ] |
| |
| Removing the drm_bridge_remove call should avoid a NULL dereference |
| during list processing in drm_bridge_remove if the error path is ever |
| taken. |
| |
| The more natural approach would perhaps be to add a drm_bridge_add, |
| but there are several other bridges that never call drm_bridge_add. |
| Just removing the drm_bridge_remove is the easier fix. |
| |
| Fixes: 84601dbdea36 ("drm: sti: rework init sequence") |
| Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Signed-off-by: Peter Rosin <peda@axentia.se> |
| Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20180806061910.29914-2-peda@axentia.se |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/sti/sti_hda.c | 1 - |
| drivers/gpu/drm/sti/sti_hdmi.c | 1 - |
| 2 files changed, 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c |
| index e7c243f708702..08808e3701de9 100644 |
| --- a/drivers/gpu/drm/sti/sti_hda.c |
| +++ b/drivers/gpu/drm/sti/sti_hda.c |
| @@ -740,7 +740,6 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data) |
| return 0; |
| |
| err_sysfs: |
| - drm_bridge_remove(bridge); |
| return -EINVAL; |
| } |
| |
| diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c |
| index 376b0763c874a..a5412a6fbeca2 100644 |
| --- a/drivers/gpu/drm/sti/sti_hdmi.c |
| +++ b/drivers/gpu/drm/sti/sti_hdmi.c |
| @@ -1352,7 +1352,6 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data) |
| return 0; |
| |
| err_sysfs: |
| - drm_bridge_remove(bridge); |
| hdmi->drm_connector = NULL; |
| return -EINVAL; |
| } |
| -- |
| 2.20.1 |
| |
