diff options
| author | Yaniv Gardi <ygardi@codeaurora.org> | 2015-09-02 19:12:43 +0300 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:00:36 -0700 |
| commit | 87d7b2b60d0a1510edb5bb18cdda0c2acc158b1a (patch) | |
| tree | 1a5cbc6ba349c879de8df4dd1dc21d4a838c909a | |
| parent | d502efe061149f06cfa47d46aa1fcc2f7e84703c (diff) | |
scsi: ufs-qcom: add probe_defer in case phy driver not probed yet
In case UFS driver is probed before the phy driver does, the
UFS driver should return a PROBE_DEFER code.
Change-Id: I94ab353fed35889b92fb2f0baf5ee029894b999b
Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
| -rw-r--r-- | drivers/scsi/ufs/ufs-qcom.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index 6f56a94e8c85..a3061cd7da0c 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -1773,7 +1773,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; |