From: Kevin Barnett Date: Wed, 31 Aug 2016 19:54:47 +0000 (-0500) Subject: scsi: smartpqi: correct controller offline issue X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e57a1f9b2fa4326ec289f1d03c658184ed6addb8;p=linux-beck.git scsi: smartpqi: correct controller offline issue Fixes: 6c223761e '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 Reviewed-by: Scott Benesh Reviewed-by: Johannes Thumshirn Reviewed-by: Tomas Henzl Signed-off-by: Kevin Barnett Signed-off-by: Don Brace Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 43bfeaca65db..d759703da287 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -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; + 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); - 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);