From: Don Brace <don.brace@microsemi.com>
Date: Sat, 25 Feb 2017 00:08:04 +0000 (-0800)
Subject: hpsa: update reset handler
X-Git-Tag: v4.1.12-93~2^2~119
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8b98a5a95e9c674d74d5a8cf11fe1b4b9aa4dbca;p=users%2Fjedix%2Flinux-maple.git

hpsa: update reset handler

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

Signed-off-by: Don Brace <don.brace@microsemi.com>

Orabug: 25605941
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
---

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 757cae131d987..d592aedee75db 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3049,7 +3049,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;