diff options
author | Rob Clark <robdclark@gmail.com> | 2014-04-25 12:30:53 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2014-05-30 15:29:42 -0400 |
commit | 8a57e95057acdc37362f09ede3d7520f71de6f93 (patch) | |
tree | d177eb03a64cbe7b64859a6064a4809ac10a1bb8 | |
parent | 182407a6ed5333fc37dd980a8de91a8f826a94f6 (diff) |
drm/msm/mdp5: fix crash in error/unload paths
Signed-off-by: Rob Clark <robdclark@gmail.com>
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c index 47f7bbb9c15a..f3daec4412ad 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | |||
@@ -85,8 +85,11 @@ static int mdp5_plane_disable(struct drm_plane *plane) | |||
85 | static void mdp5_plane_destroy(struct drm_plane *plane) | 85 | static void mdp5_plane_destroy(struct drm_plane *plane) |
86 | { | 86 | { |
87 | struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane); | 87 | struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane); |
88 | struct msm_drm_private *priv = plane->dev->dev_private; | ||
89 | |||
90 | if (priv->kms) | ||
91 | mdp5_plane_disable(plane); | ||
88 | 92 | ||
89 | mdp5_plane_disable(plane); | ||
90 | drm_plane_cleanup(plane); | 93 | drm_plane_cleanup(plane); |
91 | 94 | ||
92 | kfree(mdp5_plane); | 95 | kfree(mdp5_plane); |