Merge "media/dvb: Allow large non-contiguous buffers to map to shmbrige" (f4c3cb63) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/platform/msm/dvb/demux/mpq_dmx_plugin_common.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/*		/*
	* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.		* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
	*/		*/

	#include <linux/init.h>		#include <linux/init.h>
	@@ -1150,8 +1150,8 @@ static int mpq_sdmx_create_shm_bridge(struct dma_buf *dmabuf,
	return ret;		return ret;
	}		}

	if (!(dma_buf_flags & ION_FLAG_SECURE) \|\| (sgt->nents != 1)) {		if (!(dma_buf_flags & ION_FLAG_SECURE)) {
	MPQ_DVB_ERR_PRINT("Not a contiguous secure buffer\n");		MPQ_DVB_ERR_PRINT("Not a secure buffer\n");
	return 0;		return 0;
	}		}