Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4583b784 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs-qcom: add probe_defer in case phy driver not probed yet"

parents 825123cc a685199b
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -1772,7 +1772,16 @@ static int ufs_qcom_init(struct ufs_hba *hba)

	host->generic_phy = devm_phy_get(dev, "ufsphy");

	if (IS_ERR(host->generic_phy)) {
	if (host->generic_phy == ERR_PTR(-EPROBE_DEFER)) {
		/*
		 * UFS driver might be probed before the phy driver does.
		 * In that case we would like to return EPROBE_DEFER code.
		 */
		err = -EPROBE_DEFER;
		dev_warn(dev, "%s: required phy device. hasn't probed yet. err = %d\n",
			__func__, err);
		goto out_host_free;
	} else if (IS_ERR(host->generic_phy)) {
		err = PTR_ERR(host->generic_phy);
		dev_err(dev, "%s: PHY get failed %d\n", __func__, err);
		goto out;