summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-04-03 06:24:46 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-03 06:24:46 -0700
commit3b63b7a021bf07ca0172535c1b7344fef1b38d28 (patch)
tree9ad73d966e0f4dde3ab840fe7e578685dc2dc9fd
parent46b41403c3401be40675b5da4c64c3ed1f299a7c (diff)
parent319152bac1f598fb3fae14f6164413cdaf8797df (diff)
Merge "scsi: ufs: Abort gating if clock on request is pending"
-rw-r--r--drivers/scsi/ufs/ufshcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index c891fc8d34a3..16f130dd3c76 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1388,7 +1388,7 @@ static void ufshcd_gate_work(struct work_struct *work)
* state to CLKS_ON.
*/
if (hba->clk_gating.is_suspended ||
- (hba->clk_gating.state == REQ_CLKS_ON)) {
+ (hba->clk_gating.state != REQ_CLKS_OFF)) {
hba->clk_gating.state = CLKS_ON;
trace_ufshcd_clk_gating(dev_name(hba->dev),
hba->clk_gating.state);