diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-20 20:12:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-20 20:12:20 -0700 |
| commit | 4a95bc121ccdaee04c4d72f84dbfa6b880a514b6 (patch) | |
| tree | 71977859909ee380a967d9f86c61ec1c0d754df2 | |
| parent | 5da472ae1f128840b27795fa461b47a85d882ce2 (diff) | |
| parent | 4ca45af0a56d00b86285d6fdd720dca3215059a7 (diff) | |
Merge tag 'rproc-v6.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linuxHEADmaster
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
| -rw-r--r-- | drivers/remoteproc/qcom_wcnss.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index 775b056d795a..2c7e519a2254 100644 --- a/drivers/remoteproc/qcom_wcnss.c +++ b/drivers/remoteproc/qcom_wcnss.c @@ -456,7 +456,8 @@ static int wcnss_init_regulators(struct qcom_wcnss *wcnss, if (wcnss->num_pds) { info += wcnss->num_pds; /* Handle single power domain case */ - num_vregs += num_pd_vregs - wcnss->num_pds; + if (wcnss->num_pds < num_pd_vregs) + num_vregs += num_pd_vregs - wcnss->num_pds; } else { num_vregs += num_pd_vregs; } |