diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2019-10-09 21:54:04 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-10-09 21:54:04 -0400 |
| commit | a3a8d13f625d9f20664515d61d4c9a9452119d21 (patch) | |
| tree | 8d3bd45b741f10980c141cc35c06143a82e8ea18 /drivers/scsi/ufs | |
| parent | 27f722ccbe1563629275bb7ee30c0e307f5837a2 (diff) | |
| parent | b23f330d5145b92f90cf16f1adc5444ad06764b4 (diff) | |
Merge branch '5.4/scsi-fixes' into 5.5/scsi-queue
The qla2xxx driver updates for 5.5 depend on the fixes queued for
5.4.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/ufs')
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index b580685eebcc..c28c144d9b4a 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -8152,6 +8152,9 @@ int ufshcd_shutdown(struct ufs_hba *hba) { int ret = 0; + if (!hba->is_powered) + goto out; + if (ufshcd_is_ufs_dev_poweroff(hba) && ufshcd_is_link_off(hba)) goto out; |