evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: Allocate fd with O_CLOEXEC flag"

Browse source
This commit is contained in:
Linux Build Service Account 2018-04-29 21:09:50 -07:00 • committed by Gerrit - the friendly Code Review server
commit 866d379212
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/video/fbdev/msm/mdp3_ctrl.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -1563,9 +1563,10 @@ static int mdp3_get_metadata(struct msm_fb_data_type *mfd,
}
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);