Commit 046206ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fix from James Bottomley:
 "A single small fix for the UFS driver to fix a power management
  failure"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend
parents d4d58949 1a7edd04

drivers/ufs/core/ufshcd.c

+9 −1
Original line number Diff line number Diff line
@@ -9459,8 +9459,16 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) 
			 * that performance might be impacted.

			 */

			ret = ufshcd_urgent_bkops(hba);

			if (ret)

			if (ret) {

				/*

				 * If return err in suspend flow, IO will hang.

				 * Trigger error handler and break suspend for

				 * error recovery.

				 */

				ufshcd_force_error_recovery(hba);

				ret = -EBUSY;

				goto enable_scaling;

			}

		} else {

			/* make sure that auto bkops is disabled */

			ufshcd_disable_auto_bkops(hba);