From ec51a0f5ea90ce107eeddbb1223f0a9ecf023538 Mon Sep 17 00:00:00 2001 From: Siddharth Gupta Date: Wed, 11 Sep 2019 16:52:53 -0700 Subject: [PATCH] firmware: qcom_scm: Permit early SCM calls before driver probe In some cases we need to make early SCM calls, i.e., when the driver has not been probed. Adding NULL dereference checks to handle such cases. Change-Id: I4e6e6821795ed5833e59350865a17530494c52f9 Signed-off-by: Siddharth Gupta Signed-off-by: Elliot Berman --- drivers/firmware/qcom_scm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 056d8e298e16..fc2081c2c94d 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -338,13 +338,13 @@ EXPORT_SYMBOL(qcom_scm_tz_blsp_modify_owner); int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val) { - return __qcom_scm_io_readl(__scm->dev, addr, val); + return __qcom_scm_io_readl(__scm ? __scm->dev : NULL, addr, val); } EXPORT_SYMBOL(qcom_scm_io_readl); int qcom_scm_io_writel(phys_addr_t addr, unsigned int val) { - return __qcom_scm_io_writel(__scm->dev, addr, val); + return __qcom_scm_io_writel(__scm ? __scm->dev : NULL, addr, val); } EXPORT_SYMBOL(qcom_scm_io_writel);