Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ff365f5 authored by Don Brace's avatar Don Brace Committed by Martin K. Petersen
Browse files

scsi: hpsa: correct logical volume removal 



Suggested-by: default avatarMartin Wilck <mwilck@suse.com>
Reviewed-by: default avatarScott Benesh <scott.benesh@microsemi.com>
Reviewed-by: default avatarScott Teel <scott.teel@microsemi.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 9211a07f

drivers/scsi/hpsa.c

+6 −3
Original line number Diff line number Diff line
@@ -1882,6 +1882,12 @@ static void hpsa_remove_device(struct ctlr_info *h, 
	if (!h->scsi_host)

		return;



	/*

	 * Allow for commands to drain

	 */

	device->removed = 1;

	hpsa_wait_for_outstanding_commands_for_dev(h, device);



	if (is_logical_device(device)) { /* RAID */

		sdev = scsi_device_lookup(h->scsi_host, device->bus,

						device->target, device->lun);
@@ -1899,9 +1905,6 @@ static void hpsa_remove_device(struct ctlr_info *h, 
		}

	} else { /* HBA */



		device->removed = 1;

		hpsa_wait_for_outstanding_commands_for_dev(h, device);



		hpsa_remove_sas_device(device);

	}

}