1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
index 64722f42b256..f07e55d3aa73 100644
--- a/drivers/scsi/libsas/sas_port.c
+++ b/drivers/scsi/libsas/sas_port.c
@@ -66,6 +66,7 @@ static void sas_resume_port(struct asd_sas_phy *phy)
                 rc = sas_notify_lldd_dev_found(dev);
                 if (rc) {
                         sas_unregister_dev(port, dev);
+                        sas_destruct_devices(port);
                         continue;
                 }
 
@@ -220,6 +221,7 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone)
 
         if (port->num_phys == 1) {
                 sas_unregister_domain_devices(port, gone);
+                sas_destruct_devices(port);
                 sas_port_delete(port->port);
                 port->port = NULL;
         } else {
@@ -317,6 +319,7 @@ static void sas_init_port(struct asd_sas_port *port,
         INIT_LIST_HEAD(&port->dev_list);
         INIT_LIST_HEAD(&port->disco_list);
         INIT_LIST_HEAD(&port->destroy_list);
+        INIT_LIST_HEAD(&port->sas_port_del_list);
         spin_lock_init(&port->phy_list_lock);
         INIT_LIST_HEAD(&port->phy_list);
         port->ha = sas_ha;