diff options
author | 2017-12-06 23:37:06 +0100 | |
---|---|---|
committer | 2017-12-06 23:37:06 +0100 | |
commit | d0300e5e8d2fb74852f8116f26546e12cfa66735 (patch) | |
tree | a6580aa74a0ebd7965dbc37767717b4f73dd9d79 /drivers/gpu/drm/bridge/panel.c | |
parent | Merge tag 'perf-core-for-mingo-4.16-20171206' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff) | |
parent | tooling/headers: Synchronize updated s390 and x86 UAPI headers (diff) | |
download | linux-dev-d0300e5e8d2fb74852f8116f26546e12cfa66735.tar.xz linux-dev-d0300e5e8d2fb74852f8116f26546e12cfa66735.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh to v4.15
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/bridge/panel.c')
-rw-r--r-- | drivers/gpu/drm/bridge/panel.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index e0cca19b4044..6d99d4a3beb3 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); |