Merge tag 'arc-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[sfrench/cifs-2.6.git] / drivers / gpu / drm / bridge / panel.c

diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index e0cca19b404406d4a22a4a40d871e8a8bbd5b2e0..6d99d4a3beb36c13aac92a71cee32bc6e6c59cec 100644 (file)
--- 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);