diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 05:26:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 05:26:38 -0500 |
| commit | df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1 (patch) | |
| tree | a091be1024bd76627f78e791e377126e47703b7b /drivers/gpu/drm/msm/msm_fbdev.c | |
| parent | ed8f8ce38d0f7b505d7da2d79522972e962457c2 (diff) | |
| parent | 4e1c0664de11e4b5861957ab4ddff2aeeffd042f (diff) | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'drivers/gpu/drm/msm/msm_fbdev.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_fbdev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c index 94d55e526b4e..1f3af13ccede 100644 --- a/drivers/gpu/drm/msm/msm_fbdev.c +++ b/drivers/gpu/drm/msm/msm_fbdev.c | |||
| @@ -190,8 +190,7 @@ fail_unlock: | |||
| 190 | fail: | 190 | fail: |
| 191 | 191 | ||
| 192 | if (ret) { | 192 | if (ret) { |
| 193 | if (fbi) | 193 | framebuffer_release(fbi); |
| 194 | framebuffer_release(fbi); | ||
| 195 | if (fb) { | 194 | if (fb) { |
| 196 | drm_framebuffer_unregister_private(fb); | 195 | drm_framebuffer_unregister_private(fb); |
| 197 | drm_framebuffer_remove(fb); | 196 | drm_framebuffer_remove(fb); |