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

Commit 4b25bba8 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge e561ca2a on remote branch 

Change-Id: Id4916cbb58cd7cb47639fe8fcc92e853ef629804
parents 92825d12 e561ca2a

drivers/cam_req_mgr/cam_mem_mgr.c

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, 2022 The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>
@@ -680,7 +680,7 @@ int cam_mem_mgr_alloc_and_map(struct cam_mem_mgr_alloc_cmd *cmd) 
		if (rc) {

			CAM_ERR(CAM_MEM,

				"Failed in map_hw_va, len=%llu, flags=0x%x, fd=%d, region=%d, num_hdl=%d, rc=%d",

				cmd->len, cmd->flags, fd, region,

				len, cmd->flags, fd, region,

				cmd->num_hdl, rc);

			goto map_hw_fail;

		}
@@ -709,7 +709,7 @@ int cam_mem_mgr_alloc_and_map(struct cam_mem_mgr_alloc_cmd *cmd) 
	tbl.bufq[idx].kmdvaddr = kvaddr;

	tbl.bufq[idx].vaddr = hw_vaddr;

	tbl.bufq[idx].dma_buf = dmabuf;

	tbl.bufq[idx].len = cmd->len;

	tbl.bufq[idx].len = len;

	tbl.bufq[idx].num_hdl = cmd->num_hdl;

	memcpy(tbl.bufq[idx].hdls, cmd->mmu_hdls,

		sizeof(int32_t) * cmd->num_hdl);