hpsa: Correct double unlock of mutex
authorDon Brace <don.brace@pmcs.com>
Sat, 18 Jul 2015 16:12:22 +0000 (11:12 -0500)
committerJames Bottomley <JBottomley@Odin.com>
Wed, 26 Aug 2015 23:19:50 +0000 (16:19 -0700)
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Scott Teel <scott.teel@pmcs.com>
Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
drivers/scsi/hpsa.c

index cab4e98b2b0e81ee7f45a08c152fb3cd1d509ba2..cb11421f9cb83ec598e168620c36fc2a61cf560a 100644 (file)
@@ -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);