Commit 9c67f908 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 12cc3d53 1a8c67a8
......@@ -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.
......
......@@ -24,6 +24,7 @@ config ATH11K_PCI
select MHI_BUS
select QRTR
select QRTR_MHI
select PCI_PWRCTL_PWRSEQ if HAVE_PWRCTL
help
This module adds support for PCIE bus
......
......@@ -7,6 +7,7 @@ config ATH12K
select MHI_BUS
select QRTR
select QRTR_MHI
select PCI_PWRCTL_PWRSEQ if HAVE_PWRCTL
help
Enable support for Qualcomm Technologies Wi-Fi 7 (IEEE
802.11be) family of chipsets, for example WCN7850 and
......
# 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
......@@ -212,7 +212,8 @@ pwrseq_target_new(const struct pwrseq_target_data *data)
static void pwrseq_target_free(struct pwrseq_target *target)
{
pwrseq_unit_put(target->unit);
if (!IS_ERR_OR_NULL(target->unit))
pwrseq_unit_put(target->unit);
kfree_const(target->name);
kfree(target);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment