]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: core: Add missing scsi_device_put() in scsi_host_block()
authorYe Bin <yebin10@huawei.com>
Fri, 17 Jul 2020 09:09:20 +0000 (17:09 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Aug 2020 06:26:44 +0000 (08:26 +0200)
[ Upstream commit f30785db7546520acd53aac7497d42352ff031e0 ]

The scsi_host_block() case was missing in commit 4dea170f4fb2 ("scsi: core:
Fix incorrect usage of shost_for_each_device").

Link: https://lore.kernel.org/r/20200717090921.29243-1-yebin10@huawei.com
Fixes: 2bb955840c1d ("scsi: core: add scsi_host_(block,unblock) helper function")
Fixes: 4dea170f4fb2 ("scsi: core: Fix incorrect usage of shost_for_each_device")
Signed-off-by: Ye Bin <yebin10@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/scsi_lib.c

index 06056e9ec3335bdead7ea49cbd749b24941e2e72..ae620dada8ce5b685eba9308a72fe1674e4e159c 100644 (file)
@@ -2841,8 +2841,10 @@ scsi_host_block(struct Scsi_Host *shost)
                mutex_lock(&sdev->state_mutex);
                ret = scsi_internal_device_block_nowait(sdev);
                mutex_unlock(&sdev->state_mutex);
-               if (ret)
+               if (ret) {
+                       scsi_device_put(sdev);
                        break;
+               }
        }
 
        /*