Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760262AbcDEXhS (ORCPT ); Tue, 5 Apr 2016 19:37:18 -0400 Received: from mail-qg0-f65.google.com ([209.85.192.65]:36863 "EHLO mail-qg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753459AbcDEXhR (ORCPT ); Tue, 5 Apr 2016 19:37:17 -0400 From: Bastien Philbert To: sathya.prakash@broadcom.com Cc: chaitra.basappa@broadcom.com, suganath-prabu.subramani@broadcom.com, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mpt3sas:Make sure mpt3sas adapter has been reset in scsih_resume Date: Tue, 5 Apr 2016 19:37:11 -0400 Message-Id: <1459899431-22564-1-git-send-email-bastienphilbert@gmail.com> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 986 Lines: 29 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 --- 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