mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From e5eb0d3aa6fe62ee437a2269a1802b1a72f61b75 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Chan <bkchan@codeaurora.org>
|
|
Date: Thu, 15 Dec 2016 13:46:42 -0500
|
|
Subject: msm: mdss: Fix invalid dma attachment during fb shutdown
|
|
|
|
If DMA attachment fail during fb_mmap, all ION memory will get free. It
|
|
is necessary to reset the fbmem and fb_attachemnt pointer to NULL,
|
|
otherwise during shutdown will perform another free and causing issue.
|
|
|
|
CRs-Fixed: 1090244
|
|
Change-Id: I92affcf2ce039eecfc72b7c191e058f37815c726
|
|
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
|
|
---
|
|
drivers/video/fbdev/msm/mdss_fb.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c
|
|
index 98ca6c3..152879a 100644
|
|
--- a/drivers/video/fbdev/msm/mdss_fb.c
|
|
+++ b/drivers/video/fbdev/msm/mdss_fb.c
|
|
@@ -2082,6 +2082,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;
|
|
}
|
|
|
|
--
|
|
cgit v1.1
|
|
|