Merge tag 'vboxsf-v6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hansg...

[linux-block.git] / drivers / scsi / hosts.c

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 4f495a41ec4aaed4c52d01ee84fc274c30236a09..2d92549e52431934199ca4319c250798a1884b8e 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -353,12 +353,13 @@ static void scsi_host_dev_release(struct device *dev)
 
        if (shost->shost_state == SHOST_CREATED) {
                /*
-                * Free the shost_dev device name here if scsi_host_alloc()
-                * and scsi_host_put() have been called but neither
+                * Free the shost_dev device name and remove the proc host dir
+                * here if scsi_host_{alloc,put}() have been called but neither
                 * scsi_host_add() nor scsi_remove_host() has been called.
                 * This avoids that the memory allocated for the shost_dev
-                * name is leaked.
+                * name as well as the proc dir structure are leaked.
                 */
+               scsi_proc_hostdir_rm(shost->hostt);
                kfree(dev_name(&shost->shost_dev));
        }