Commit 04948e75 authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

phy: qcom-qmp-combo: fix NULL-deref on runtime resume 



Commit fc646236 ("phy: qcom-qmp-combo,usb: add support for separate
PCS_USB region") started treating the PCS_USB registers as potentially
separate from the PCS registers but used the wrong base when no PCS_USB
offset has been provided.

Fix the PCS_USB base used at runtime resume to prevent dereferencing a
NULL pointer on platforms that do not provide a PCS_USB offset (e.g.
SC7180).

Fixes: fc646236 ("phy: qcom-qmp-combo,usb: add support for separate PCS_USB region")
Cc: stable@vger.kernel.org	# 5.20
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20221026162116.26462-1-johan+linaro@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 2a4ea83b

drivers/phy/qualcomm/phy-qcom-qmp-combo.c

+1 −1
Original line number Diff line number Diff line
@@ -2240,7 +2240,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 */