diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-10 02:20:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-10 02:20:47 -0700 |
| commit | c1a2472056c800ff46e0ac21a4b67c179a570ad0 (patch) | |
| tree | c52ff0439a382c1f7622ef695553164f5061b835 /drivers | |
| parent | 73d6c8e7de64d0ce66bcf0a78810fff82b9327b7 (diff) | |
| parent | 8983eadbc9270e142962744764b3e38befb854f2 (diff) | |
Merge "fbdev: msm: Allocate fd with O_CLOEXEC flag"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_overlay.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c index 3c679877705d..fbd5b01a81e7 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c +++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c @@ -4987,9 +4987,10 @@ static int mdss_fb_get_metadata(struct msm_fb_data_type *mfd, ret = mdss_fb_get_hw_caps(mfd, &metadata->data.caps); break; case metadata_op_get_ion_fd: - if (mfd->fb_ion_handle) { + if (mfd->fb_ion_handle && mfd->fb_ion_client) { metadata->data.fbmem_ionfd = - dma_buf_fd(mfd->fbmem_buf, 0); + ion_share_dma_buf_fd(mfd->fb_ion_client, + mfd->fb_ion_handle); if (metadata->data.fbmem_ionfd < 0) pr_err("fd allocation failed. fd = %d\n", metadata->data.fbmem_ionfd); |