diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-13 06:23:22 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-13 06:23:22 -0800 |
| commit | c803ca5bd8bfdc838e20bfd8ce4b3f090fae920d (patch) | |
| tree | 35fc5b8dd1471c693100388ae6b153bb96d5395e | |
| parent | a2fad6d13e8059b558e15b1a4d55949f20fd8e61 (diff) | |
| parent | 0fb9265a5911d60051fd181b04f568d937286f19 (diff) | |
Merge "scsi: ufs: set load before setting voltage in regulators"
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 6af0ca6eb7e2..707da4ae8185 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7997,6 +7997,11 @@ static int ufshcd_config_vreg(struct device *dev, name = vreg->name; if (regulator_count_voltages(reg) > 0) { + uA_load = on ? vreg->max_uA : 0; + ret = ufshcd_config_vreg_load(dev, vreg, uA_load); + if (ret) + goto out; + min_uV = on ? vreg->min_uV : 0; ret = regulator_set_voltage(reg, min_uV, vreg->max_uV); if (ret) { @@ -8004,11 +8009,6 @@ static int ufshcd_config_vreg(struct device *dev, __func__, name, ret); goto out; } - - uA_load = on ? vreg->max_uA : 0; - ret = ufshcd_config_vreg_load(dev, vreg, uA_load); - if (ret) - goto out; } out: return ret; |