From: James Bottomley <JBottomley@Parallels.com>
Date: Mon, 8 Dec 2014 15:40:20 +0000 (-0800)
Subject: Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dc843ef00e79ef0466d4d66bb20beeccda92e003;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus
---

dc843ef00e79ef0466d4d66bb20beeccda92e003
diff --cc drivers/scsi/ufs/ufshcd.c
index 605ca60e8a10,362b818ad827..820fc7d96084
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -2860,15 -2838,9 +2856,14 @@@ static void ufshcd_slave_destroy(struc
  	struct ufs_hba *hba;
  
  	hba = shost_priv(sdev->host);
- 	scsi_deactivate_tcq(sdev, hba->nutrs);
  	/* Drop the reference as it won't be needed anymore */
 -	if (ufshcd_scsi_to_upiu_lun(sdev->lun) == UFS_UPIU_UFS_DEVICE_WLUN)
 +	if (ufshcd_scsi_to_upiu_lun(sdev->lun) == UFS_UPIU_UFS_DEVICE_WLUN) {
 +		unsigned long flags;
 +
 +		spin_lock_irqsave(hba->host->host_lock, flags);
  		hba->sdev_ufs_device = NULL;
 +		spin_unlock_irqrestore(hba->host->host_lock, flags);
 +	}
  }
  
  /**