aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2019-05-29 14:07:39 +0300
committerMartin K. Petersen <martin.petersen@oracle.com>2019-06-04 22:22:29 -0400
commitcc8f52609bb4177febade24d11713e20c0893b0a (patch)
treed9e81eaa0ea74e4068239984f3619d0c5a5793ab /drivers/scsi
parentscsi: ufs: Check that space was properly alloced in copy_query_response (diff)
downloadlinux-dev-cc8f52609bb4177febade24d11713e20c0893b0a.tar.xz
linux-dev-cc8f52609bb4177febade24d11713e20c0893b0a.zip
scsi: smartpqi: unlock on error in pqi_submit_raid_request_synchronous()
We need to drop the "ctrl_info->sync_request_sem" lock before returning. Fixes: 6c223761eb54 ("smartpqi: initial commit of Microsemi smartpqi driver") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Don Brace <don.brace@microsemi.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/smartpqi/smartpqi_init.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index d6be4e8f4a8f..8fd5ffc55792 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -4046,8 +4046,10 @@ static int pqi_submit_raid_request_synchronous(struct pqi_ctrl_info *ctrl_info,
return -ETIMEDOUT;
msecs_blocked =
jiffies_to_msecs(jiffies - start_jiffies);
- if (msecs_blocked >= timeout_msecs)
- return -ETIMEDOUT;
+ if (msecs_blocked >= timeout_msecs) {
+ rc = -ETIMEDOUT;
+ goto out;
+ }
timeout_msecs -= msecs_blocked;
}
}