@@ -2399,12 +2399,12 @@ static int cpr_pd_attach_dev(struct generic_pm_domain *domain,
if (ret)
goto exit;
- if (acc_desc->config)
+ if (acc_desc && acc_desc->config)
regmap_multi_reg_write(drv->tcsr, acc_desc->config,
acc_desc->num_regs_per_fuse);
/* Enable ACC if required */
- if (acc_desc->enable_mask)
+ if (acc_desc && acc_desc->enable_mask)
regmap_update_bits(drv->tcsr, acc_desc->enable_reg,
acc_desc->enable_mask,
acc_desc->enable_mask);
@@ -2703,7 +2703,7 @@ static int cpr_probe(struct platform_device *pdev)
mutex_init(&drv->lock);
- if (desc->cpr_type < CTRL_TYPE_CPRH) {
+ if (data->acc_desc && desc->cpr_type < CTRL_TYPE_CPRH) {
np = of_parse_phandle(dev->of_node, "qcom,acc", 0);
if (!np)
return -ENODEV;
cpr3 code assumes that 'acc_desc' is available for SoCs implementing CPR version 4 or less. However, IPQ9574 SoC implements CPRv4 without ACC. This causes NULL pointer accesses resulting in crashes. Hence, check if 'acc_desc' is populated before using it. Signed-off-by: Varadarajan Narayanan <quic_varada@quicinc.com> --- v5: Add acc_desc check in a different way without breaking other SoC v4: Undo the acc_desc validation in probe function as that could affect other SoC. --- drivers/pmdomain/qcom/cpr3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)