aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Brace <[email protected]>2015-07-18 11:12:22 -0500
committerJames Bottomley <[email protected]>2015-08-26 16:19:50 -0700
commit77678d3a35455d7b7c4da4e56b20de17ee63cec1 (patch)
tree5116101a89a57903f5d18a3f82e20df95c71200a
parent5aeeb78aeb4c8607cbda54a7b0dc7315171e214f (diff)
hpsa: Correct double unlock of mutex
Reported-by: Dan Carpenter <[email protected]> Reviewed-by: Scott Teel <[email protected]> Reviewed-by: Kevin Barnett <[email protected]> Reviewed-by: Tomas Henzl <[email protected]> Signed-off-by: Don Brace <[email protected]> Signed-off-by: James Bottomley <[email protected]>
-rw-r--r--drivers/scsi/hpsa.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index cab4e98b2b0e..cb11421f9cb8 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);