summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-04-16 10:44:19 +0300
committerJames Bottomley <JBottomley@Parallels.com>2013-05-02 12:08:46 -0700
commitc64e483ea0a1d7483a5c1ac42ccdf7788eb3ce90 (patch)
treeacaff24170b70ae27f86d62926f73a3c3cc00224
parent883467871c60125765e0674199ef34a9b8d203bd (diff)
downloadop-kernel-dev-c64e483ea0a1d7483a5c1ac42ccdf7788eb3ce90.zip
op-kernel-dev-c64e483ea0a1d7483a5c1ac42ccdf7788eb3ce90.tar.gz
[SCSI] megaraid_sas: release lock on error path
We should unlock here before returning. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Adam Radford <aradford@gmail.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_base.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 7c90d57..3a9ddae 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -4931,11 +4931,12 @@ static int megasas_mgmt_ioctl_fw(struct file *file, unsigned long arg)
printk(KERN_ERR "megaraid_sas: timed out while"
"waiting for HBA to recover\n");
error = -ENODEV;
- goto out_kfree_ioc;
+ goto out_up;
}
spin_unlock_irqrestore(&instance->hba_lock, flags);
error = megasas_mgmt_fw_ioctl(instance, user_ioc, ioc);
+ out_up:
up(&instance->ioctl_sem);
out_kfree_ioc:
OpenPOWER on IntegriCloud