diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-19 14:31:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-19 14:31:18 -0700 |
| commit | 9c67f9084af3f84e63abb44b82316fe0dbccd5d5 (patch) | |
| tree | eb17f64e3ecf9133f63df51b81fed779d658daf3 /arch | |
| parent | 12cc3d5389f313f07222b000fefa2cd8fc98c4f8 (diff) | |
| parent | 1a8c67a8b21e26843d5641c55f48130b3e323ce8 (diff) | |
Merge tag 'pwrseq-fixes-for-v6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull power sequencing fixes from Bartosz Golaszewski:
"There's one fix for an invalid pointer dereference in error path
reported by smatch and two patches that address the noisy config
choices you reported earlier this week.
Summary:
- fix an invalid pointer dereference in error path in pwrseq core
- reduce the Kconfig noise from PCI pwrctl choices"
* tag 'pwrseq-fixes-for-v6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
arm64: qcom: don't select HAVE_PWRCTL when PCI=n
Kconfig: reduce the amount of power sequencing noise
power: sequencing: fix an invalid pointer dereference in error path
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index d1461335e78f..56f440a06b21 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -266,6 +266,7 @@ config ARCH_QCOM bool "Qualcomm Platforms" select GPIOLIB select PINCTRL + select HAVE_PWRCTL if PCI help This enables support for the ARMv8 based Qualcomm chipsets. |