diff options
| author |   Vinod Koul <vkoul@kernel.org> | 2022-10-28 18:39:28 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-10-28 18:39:28 +0530 |
| commit | 25dcaf94448f41f1634e8e44f28f37b1aff4bc2c (patch) | |
| tree | dcee8deb3839c8a45bd9753c6391d5c510e746b1 /drivers/phy/qualcomm/phy-qcom-qmp-combo.c | |
| parent | phy: qcom-qmp-ufs: add support for updated sc8280xp binding (diff) | |
| parent | phy: qcom-qmp-combo: fix NULL-deref on runtime resume (diff) | |
| download | wireguard-linux-25dcaf94448f41f1634e8e44f28f37b1aff4bc2c.tar.xz wireguard-linux-25dcaf94448f41f1634e8e44f28f37b1aff4bc2c.zip | |
Merge branch 'fixes' into next
Merge the fixes to next as both carry qmp-phy patches
Diffstat (limited to 'drivers/phy/qualcomm/phy-qcom-qmp-combo.c')
| -rw-r--r-- | drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 2fab8d5ec0f1..5e11b6a1d189 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -2150,7 +2150,7 @@ static void qmp_combo_enable_autonomous_mode(struct qmp_phy *qphy) static void qmp_combo_disable_autonomous_mode(struct qmp_phy *qphy) { const struct qmp_phy_cfg *cfg = qphy->cfg; - void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs_usb; + void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs; void __iomem *pcs_misc = qphy->pcs_misc; /* Disable i/o clamp_n on resume for normal mode */ |