]> git.ipfire.org Git - thirdparty/kernel/stable.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:35:58 +0000 (11:35 +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 411d656f253046ac6125bdf6b3022f747a73e235..98f2d076f938f3378d85fd39bccfd2fc5f515a04 100644 (file)
@@ -3697,8 +3697,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;
                }
        }