From: Don Brace <don.brace@microsemi.com>
Date: Thu, 4 May 2017 22:50:58 +0000 (-0500)
Subject: scsi: hpsa: update reset handler
X-Git-Tag: v4.13-rc1~136^2~254
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8516a2db9aec293d983a729c23488acd688fece4;p=karo-tx-linux.git

scsi: hpsa: update reset handler

Use the return from TUR as a check for the device state.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Scott Teel <scott.tell@microsemi.com>
Reviewed-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 8e22aed09adb..9fb30c4aae82 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3090,7 +3090,7 @@ static int hpsa_do_reset(struct ctlr_info *h, struct hpsa_scsi_dev_t *dev,
 	if (unlikely(rc))
 		atomic_set(&dev->reset_cmds_out, 0);
 	else
-		wait_for_device_to_become_ready(h, scsi3addr, 0);
+		rc = wait_for_device_to_become_ready(h, scsi3addr, 0);
 
 	mutex_unlock(&h->reset_mutex);
 	return rc;