--- drivers/scsi/mpt2sas/mpt2sas_scsih.c

+++ drivers/scsi/mpt2sas/mpt2sas_scsih.c

@@ -5721,6 +5721,8 @@ _scsih_remove(struct pci_dev *pdev)

struct _sas_port *mpt2sas_port;

struct _sas_device *sas_device;

struct _sas_node *expander_sibling;

+ struct _raid_device *raid_device, *next;

+ struct MPT2SAS_TARGET *sas_target_priv_data;

struct workqueue_struct *wq;

unsigned long flags;

@@ -5734,6 +5736,21 @@ _scsih_remove(struct pci_dev *pdev)

if (wq)

destroy_workqueue(wq);

+ /* release all the volumes */

+ list_for_each_entry_safe(raid_device, next, &ioc->raid_device_list,

+ list) {

+ if (raid_device->starget) {

+ sas_target_priv_data =

+ raid_device->starget->hostdata;

+ sas_target_priv_data->deleted = 1;

+ scsi_remove_target(&raid_device->starget->dev);

+ }

+ printk(MPT2SAS_INFO_FMT "removing handle(0x%04x), wwid"

+ "(0x%016llx)\n", ioc->name, raid_device->handle,

+ (unsigned long long) raid_device->wwid);

+ _scsih_raid_device_remove(ioc, raid_device);

+ }

+

/* free ports attached to the sas_host */

retry_again:

list_for_each_entry(mpt2sas_port,