Unverified Commit 0b5d04ae authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15723 phy: qcom-qmp: fix reset-controller leak on probe errors 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Bin <yebin10@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/GNNMYEXOLJVOHQVMQEFVNZ7IIJHDPSB4/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP74Q 
 
Link:https://gitee.com/openeuler/kernel/pulls/15723

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents e4db586f 93421af1

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

+9 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,11 @@ static const struct phy_ops qcom_qmp_phy_gen_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)

{
@@ -1488,6 +1493,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;

	}



	generic_phy = devm_phy_create(dev, np, &qcom_qmp_phy_gen_ops);