diff options
| author | Yaniv Gardi <ygardi@codeaurora.org> | 2016-12-06 04:25:15 +0100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-12-08 22:59:53 +0100 |
| commit | ab436706e4a86719595012424ecefbdf4a84cc30 (patch) | |
| tree | a7eab9adf5bbde41c7af7c873427df0c0ec8cea5 | |
| parent | scsi: ufs: add support for UFS HCI 2.1 (diff) | |
| download | linux-ab436706e4a86719595012424ecefbdf4a84cc30.tar.xz linux-ab436706e4a86719595012424ecefbdf4a84cc30.zip | |
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.
Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -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 aa43bfea0d00..ff614613bf89 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -1194,7 +1194,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_variant_clear; + } 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_variant_clear; |