diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2019-05-29 14:07:39 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-25 11:36:53 +0800 |
| commit | 569899ffe1b416c8fd4c5a99a02eb452c139440e (patch) | |
| tree | 50eaafe96bb1efac582e3f72d495ced3e4b7b88d | |
| parent | c27a9807d67ec5fa1073a8848e136357c70a96a3 (diff) | |
| download | linux-569899ffe1b416c8fd4c5a99a02eb452c139440e.tar.gz linux-569899ffe1b416c8fd4c5a99a02eb452c139440e.tar.bz2 linux-569899ffe1b416c8fd4c5a99a02eb452c139440e.zip | |
scsi: smartpqi: unlock on error in pqi_submit_raid_request_synchronous()
[ Upstream commit cc8f52609bb4177febade24d11713e20c0893b0a ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/scsi/smartpqi/smartpqi_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index d34351c6b9af..4055753b495a 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -3686,8 +3686,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; } } |