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 /drivers/pci | |
| parent | 12cc3d5389f313f07222b000fefa2cd8fc98c4f8 (diff) | |
| parent | 1a8c67a8b21e26843d5641c55f48130b3e323ce8 (diff) | |
| download | lwn-9c67f9084af3f84e63abb44b82316fe0dbccd5d5.tar.gz lwn-9c67f9084af3f84e63abb44b82316fe0dbccd5d5.zip | |
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 'drivers/pci')
| -rw-r--r-- | drivers/pci/pwrctl/Kconfig | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/pci/pwrctl/Kconfig b/drivers/pci/pwrctl/Kconfig index f1b824955d4b..54589bb2403b 100644 --- a/drivers/pci/pwrctl/Kconfig +++ b/drivers/pci/pwrctl/Kconfig @@ -1,17 +1,12 @@ # SPDX-License-Identifier: GPL-2.0-only -menu "PCI Power control drivers" +config HAVE_PWRCTL + bool config PCI_PWRCTL tristate config PCI_PWRCTL_PWRSEQ - tristate "PCI Power Control driver using the Power Sequencing subsystem" + tristate select POWER_SEQUENCING select PCI_PWRCTL - default m if ((ATH11K_PCI || ATH12K) && ARCH_QCOM) - help - Enable support for the PCI power control driver for device - drivers using the Power Sequencing subsystem. - -endmenu |