From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB247C33CB1 for ; Thu, 16 Jan 2020 16:53:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A3D35214AF for ; Thu, 16 Jan 2020 16:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193606; bh=drBKSQal6Kqb4KQB0xgWPDgk84pgJ9f9Sw1WHZ+o6NY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=L2tEHjpTRN4zqBW7Vi01aQ3DT2bXxwnRuqsz+xAMevQrrvzkhYE/ctIvO3azZ0ZAS I9ySRWBnLGpENYqAp6TX/22wm7lt7zuIcQi2aEoBO9HPrmQmM7Z2zs2zISu5UjZERM 51+JURHKygH0VUd1k4Je4YWOKvyr+3WkKt8NUwps= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730914AbgAPQx0 (ORCPT ); Thu, 16 Jan 2020 11:53:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:37030 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730724AbgAPQxR (ORCPT ); Thu, 16 Jan 2020 11:53:17 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 69D8324679; Thu, 16 Jan 2020 16:53:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193597; bh=drBKSQal6Kqb4KQB0xgWPDgk84pgJ9f9Sw1WHZ+o6NY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RNOfFfRdK0XtR/5z+Nhr6f42+JRa2Yy6dkZzrJQvJBNaQKXPmmXZ+VaLSkkmtY4J2 S0jim98y6SF2R1jxae4QN5/8vs11uPAfKgv6BoPZBu1I+fp2kE8u/I3B1e9Wb9mN0v nlWpl8dZaALevsEX/xaRGA8MpB+IrWwHOd64r/0M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiang Chen , John Garry , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 136/205] scsi: hisi_sas: Return directly if init hardware failed Date: Thu, 16 Jan 2020 11:41:51 -0500 Message-Id: <20200116164300.6705-136-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116164300.6705-1-sashal@kernel.org> References: <20200116164300.6705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiang Chen [ Upstream commit 547fde8b5a1923050f388caae4f76613b5a620e0 ] Need to return directly if init hardware failed. Fixes: 73a4925d154c ("scsi: hisi_sas: Update all the registers after suspend and resume") Link: https://lore.kernel.org/r/1573551059-107873-3-git-send-email-john.garry@huawei.com Signed-off-by: Xiang Chen Signed-off-by: John Garry Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index c4f76d7c29db..723f51c822af 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -3423,6 +3423,7 @@ static int hisi_sas_v3_resume(struct pci_dev *pdev) if (rc) { scsi_remove_host(shost); pci_disable_device(pdev); + return rc; } hisi_hba->hw->phys_init(hisi_hba); sas_resume_ha(sha); -- 2.20.1