Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a088f113 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: Allocate fd with O_CLOEXEC flag"

parents 087c4171 8a945424

drivers/video/msm/mdss/mdp3_ctrl.c

+4 −3
Original line number Diff line number Diff line 
/* 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
@@ -1723,9 +1723,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);