From fb20a72f878363f733ca0f9c44cc19ae638d0024 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 3 Jun 2020 21:10:22 +0300 Subject: Revert "soc: qcom: msm-spm: Remove useless NULL check in msm_spm_drv_flush_shadow" * We'll take the upstream fix This reverts commit 67c3cabf052b093c949e4fb1070ba416786e3960. Change-Id: I41b1e7968c7bbe0cd5d5343873dbc103842235aa --- drivers/soc/qcom/msm-spm.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/soc') diff --git a/drivers/soc/qcom/msm-spm.c b/drivers/soc/qcom/msm-spm.c index 115dc53477dd..508aa77c7e42 100644 --- a/drivers/soc/qcom/msm-spm.c +++ b/drivers/soc/qcom/msm-spm.c @@ -153,6 +153,8 @@ static void msm_spm_drv_flush_shadow(struct msm_spm_driver_data *dev, { BUG_ON(!dev); + BUG_ON(!dev->reg_shadow); + __raw_writel(dev->reg_shadow[reg_index], dev->reg_base_addr + dev->reg_offsets[reg_index]); } -- cgit v1.2.3