From 9099e8a87ce93d872095e7d0eef82c61c43c83be Mon Sep 17 00:00:00 2001 From: Ruofei Ma Date: Mon, 3 Feb 2020 18:03:38 -0800 Subject: [PATCH] msm: cvp: fix DSP probe crash Fix dsp probe crash from cvp driver when cvp hardware is enabled. Change-Id: I22abb2ccd3e4a8c983b9bc3f49ea86d9f41f546b Signed-off-by: Ruofei Ma --- drivers/media/platform/msm/cvp/msm_cvp_dsp.c | 2 +- drivers/media/platform/msm/cvp/msm_cvp_platform.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/msm/cvp/msm_cvp_dsp.c b/drivers/media/platform/msm/cvp/msm_cvp_dsp.c index daeaa63245f0..8ad4cb23b19e 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp_dsp.c +++ b/drivers/media/platform/msm/cvp/msm_cvp_dsp.c @@ -389,7 +389,7 @@ void cvp_dsp_send_hfi_queue(void) int rc; core = list_first_entry(&cvp_driver->cores, struct msm_cvp_core, list); - if (core) + if (core && core->device) device = core->device->hfi_device_data; else return; diff --git a/drivers/media/platform/msm/cvp/msm_cvp_platform.c b/drivers/media/platform/msm/cvp/msm_cvp_platform.c index 0da95acb8214..d190899c5b97 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp_platform.c +++ b/drivers/media/platform/msm/cvp/msm_cvp_platform.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. */ #include @@ -108,7 +108,7 @@ static struct msm_cvp_common_data sm8350_common_data[] = { }, { .key = "qcom,sw-power-collapse", - .value = 1, + .value = 0, }, { .key = "qcom,domain-attr-non-fatal-faults",