]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
scsi: smartpqi: unlock on error in pqi_submit_raid_request_synchronous()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 29 May 2019 11:07:39 +0000 (14:07 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 25 Jun 2019 03:36:53 +0000 (11:36 +0800)
[ 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>
drivers/scsi/smartpqi/smartpqi_init.c

index d34351c6b9af9a10fd28dafc2dba38c84e6b8d65..4055753b495a32c2c47c3e3898bbddbc39c8de02 100644 (file)
@@ -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;
                }
        }