diff options
| author | David S. Miller <davem@davemloft.net> | 2019-01-21 14:41:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-21 14:41:32 -0800 |
| commit | fa7f3a8d56b38a3ed1880a3780afba82387da277 (patch) | |
| tree | a4628ee966f21963e5e97a6d1a227a3e8138183e /drivers/scsi/ufs/ufshcd.c | |
| parent | 28f9d1a3d4fecdb2352d3984ddeec88146385885 (diff) | |
| parent | 49a57857aeea06ca831043acbb0fa5e0f50602fd (diff) | |
| download | talos-op-linux-fa7f3a8d56b38a3ed1880a3780afba82387da277.tar.gz talos-op-linux-fa7f3a8d56b38a3ed1880a3780afba82387da277.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Completely minor snmp doc conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/ufs/ufshcd.c')
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 9ba7671b84f8..71334aaf1447 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -8001,6 +8001,8 @@ out: trace_ufshcd_system_resume(dev_name(hba->dev), ret, ktime_to_us(ktime_sub(ktime_get(), start)), hba->curr_dev_pwr_mode, hba->uic_link_state); + if (!ret) + hba->is_sys_suspended = false; return ret; } EXPORT_SYMBOL(ufshcd_system_resume); |
