summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/msm
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-03 17:56:54 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-03 17:56:54 -0800
commite60e904d4e7457386748f5e80fe8b56da7a79bd1 (patch)
tree5854d899b67afa7788c04cab5abd7fd54dae16a9 /drivers/video/fbdev/msm
parent786f20f250ea6c913ad5e3d81e3b34a3fe6cc489 (diff)
parente5eb0d3aa6fe62ee437a2269a1802b1a72f61b75 (diff)
Merge "msm: mdss: Fix invalid dma attachment during fb shutdown"
Diffstat (limited to 'drivers/video/fbdev/msm')
-rw-r--r--drivers/video/fbdev/msm/mdss_fb.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c
index 0f5a156d638c..36c48040d8ce 100644
--- a/drivers/video/fbdev/msm/mdss_fb.c
+++ b/drivers/video/fbdev/msm/mdss_fb.c
@@ -2098,6 +2098,10 @@ err_put:
dma_buf_put(mfd->fbmem_buf);
fb_mmap_failed:
ion_free(mfd->fb_ion_client, mfd->fb_ion_handle);
+ mfd->fb_attachment = NULL;
+ mfd->fb_table = NULL;
+ mfd->fb_ion_handle = NULL;
+ mfd->fbmem_buf = NULL;
return rc;
}