Make sure that bridge parameter is not NULL and can be safely
cast into a panel_bridge structure.

Signed-off-by: Benjamin Gaignard <benjamin.gaign...@linaro.org>
Reviewed-by: Philippe Cornu <philippe.co...@st.com>
Tested-by: Philippe Cornu <philippe.co...@st.com>
---
 drivers/gpu/drm/bridge/panel.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index e0cca19..6d99d4a 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -188,7 +188,15 @@ EXPORT_SYMBOL(drm_panel_bridge_add);
  */
 void drm_panel_bridge_remove(struct drm_bridge *bridge)
 {
-       struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge);
+       struct panel_bridge *panel_bridge;
+
+       if (!bridge)
+               return;
+
+       if (bridge->funcs != &panel_bridge_bridge_funcs)
+               return;
+
+       panel_bridge = drm_bridge_to_panel_bridge(bridge);
 
        drm_bridge_remove(bridge);
        devm_kfree(panel_bridge->panel->dev, bridge);
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to