Reported-by: Dan Carpenter <dan.carpen...@oracle.com>
Reviewed-by: Scott Teel <scott.t...@pmcs.com>
Reviewed-by: Kevin Barnett <kevin.barn...@pmcs.com>
Signed-off-by: Don Brace <don.br...@pmcs.com>
---
 drivers/scsi/hpsa.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 1dafeb4..1d5f4fd 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2749,11 +2749,10 @@ static int hpsa_do_reset(struct ctlr_info *h, struct 
hpsa_scsi_dev_t *dev,
                        lockup_detected(h));
 
        if (unlikely(lockup_detected(h))) {
-                       dev_warn(&h->pdev->dev,
-                                "Controller lockup detected during reset 
wait\n");
-                       mutex_unlock(&h->reset_mutex);
-                       rc = -ENODEV;
-               }
+               dev_warn(&h->pdev->dev,
+                        "Controller lockup detected during reset wait\n");
+               rc = -ENODEV;
+       }
 
        if (unlikely(rc))
                atomic_set(&dev->reset_cmds_out, 0);

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to