* [PATCH] mpt3sas:Make sure mpt3sas adapter has been reset in scsih_resume
@ 2016-04-05 23:37 Bastien Philbert
0 siblings, 0 replies; only message in thread
From: Bastien Philbert @ 2016-04-05 23:37 UTC (permalink / raw)
To: sathya.prakash
Cc: chaitra.basappa, suganath-prabu.subramani, jejb, martin.petersen,
MPT-FusionLinux.pdl, linux-scsi, linux-kernel
This fixes the issue in the function scih_resume that we assume
that the mpt3sas adapter has been reset properly with a call to
mpt3sas_base_hard_reset_handler by checking if this function
call returns a error code and exit adpater resume prematurely
Signed-off-by: Bastien Philbert <bastienphilbert@gmail.com>
---
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index e0e4920..be2a7c3 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -8892,7 +8892,11 @@ scsih_resume(struct pci_dev *pdev)
if (r)
return r;
- mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP, SOFT_RESET);
+ r = mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP, SOFT_RESET);
+ if (r) {
+ mpt3sas_base_free_resources(ioc);
+ return r;
+ }
scsi_unblock_requests(shost);
mpt3sas_base_start_watchdog(ioc);
return 0;
--
2.5.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-04-05 23:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-05 23:37 [PATCH] mpt3sas:Make sure mpt3sas adapter has been reset in scsih_resume Bastien Philbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).