From 842dc26b17b6a55860a503e18702639e48669a9f Mon Sep 17 00:00:00 2001 From: Swetha Chikkaboraiah Date: Fri, 5 Mar 2021 17:57:02 +0530 Subject: [PATCH] uio: msm_sharedmem: By pass failure for hyp_assign_phys For legacy targets hypervisor is not supported. So by pass hyp_assign_phys failure. Change-Id: Iabd301d577922e066cf6aa9257735d60f968dc69 Signed-off-by: Swetha Chikkaboraiah --- drivers/uio/msm_sharedmem/msm_sharedmem.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/uio/msm_sharedmem/msm_sharedmem.c b/drivers/uio/msm_sharedmem/msm_sharedmem.c index 2cd101b9f550..64c20deada1c 100644 --- a/drivers/uio/msm_sharedmem/msm_sharedmem.c +++ b/drivers/uio/msm_sharedmem/msm_sharedmem.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. */ #define DRIVER_NAME "msm_sharedmem" @@ -186,11 +186,8 @@ static int msm_sharedmem_probe(struct platform_device *pdev) "qcom,vm-nav-path"); /* Set up the permissions for the shared ram that was allocated. */ - ret = setup_shared_ram_perms(client_id, shared_mem_pyhsical, + setup_shared_ram_perms(client_id, shared_mem_pyhsical, shared_mem_size, vm_nav_path); - if (ret) - goto out; - /* Setup device */ info->mmap = sharedmem_mmap; /* Custom mmap function. */ info->name = clnt_res->name;