Skip to content

Commit 4a95bc1

Browse files
committed
Merge tag 'rproc-v6.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull remoteproc fix from Bjorn Andersson: "Address a regression preventing the wireless subsystem remoteproc on some Qualcomm platforms (e.g. SDM632) from working" * tag 'rproc-v6.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux: remoteproc: qcom_wcnss: Fix on platforms without fallback regulators
2 parents 5da472a + 4ca45af commit 4a95bc1

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/remoteproc/qcom_wcnss.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,8 @@ static int wcnss_init_regulators(struct qcom_wcnss *wcnss,
456456
if (wcnss->num_pds) {
457457
info += wcnss->num_pds;
458458
/* Handle single power domain case */
459-
num_vregs += num_pd_vregs - wcnss->num_pds;
459+
if (wcnss->num_pds < num_pd_vregs)
460+
num_vregs += num_pd_vregs - wcnss->num_pds;
460461
} else {
461462
num_vregs += num_pd_vregs;
462463
}

0 commit comments

Comments
 (0)