Messages in this thread | | | Date | Mon, 2 May 2022 06:03:50 -0700 | From | Bjorn Andersson <> | Subject | Re: [PATCH v2 2/3] phy: qcom-qmp: fix reset-controller leak on probe errors |
| |
On Tue 26 Apr 23:32 PDT 2022, Johan Hovold wrote:
> Make sure to release the lane reset controller in case of a late probe > error (e.g. probe deferral). > > Note that due to the reset controller being defined in devicetree in > "lane" child nodes, devm_reset_control_get_exclusive() cannot be used > directly. > > Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets") > Cc: stable@vger.kernel.org # 4.12 > Cc: Vivek Gautam <vivek.gautam@codeaurora.org> > Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> --- > drivers/phy/qualcomm/phy-qcom-qmp.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c > index a84f7d1fc9b7..3f77830921f5 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c > @@ -6005,6 +6005,11 @@ static const struct phy_ops qcom_qmp_pcie_ufs_ops = { > .owner = THIS_MODULE, > }; > > +static void qcom_qmp_reset_control_put(void *data) > +{ > + reset_control_put(data); > +} > + > static > int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id, > void __iomem *serdes, const struct qmp_phy_cfg *cfg) > @@ -6099,6 +6104,10 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id, > dev_err(dev, "failed to get lane%d reset\n", id); > return PTR_ERR(qphy->lane_rst); > } > + ret = devm_add_action_or_reset(dev, qcom_qmp_reset_control_put, > + qphy->lane_rst); > + if (ret) > + return ret; > } > > if (cfg->type == PHY_TYPE_UFS || cfg->type == PHY_TYPE_PCIE) > -- > 2.35.1 >
| |