Commit e57a1f9b authored Aug 31, 2016 by Kevin Barnett Committed by Martin K. Petersen Sep 02, 2016

scsi: smartpqi: correct controller offline issue



Fixes: 6c223761 'smartpqi: initial commit of Microsemi smartpqi driver'

Fixed a bug where the driver would not free all of the
controller resources if the controller ever went offline.

Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent ff6abb73

drivers/scsi/smartpqi/smartpqi_init.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -5609,19 +5609,14 @@ static void pqi_free_ctrl_resources(struct pqi_ctrl_info *ctrl_info)

		static void pqi_remove_ctrl(struct pqi_ctrl_info *ctrl_info)
		{
		int rc;

		if (ctrl_info->controller_online) {
		cancel_delayed_work_sync(&ctrl_info->rescan_work);
		cancel_delayed_work_sync(&ctrl_info->update_time_work);
		pqi_remove_all_scsi_devices(ctrl_info);
		pqi_unregister_scsi(ctrl_info);
		ctrl_info->controller_online = false;
		}

		if (ctrl_info->pqi_mode_enabled) {
		sis_disable_msix(ctrl_info);
		rc = pqi_reset(ctrl_info);
		if (rc == 0)
		if (pqi_reset(ctrl_info) == 0)
		sis_reenable_sis_mode(ctrl_info);
		}
		pqi_free_ctrl_resources(ctrl_info);