From patchwork Mon May 24 15:25:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 446455 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp3447388jac; Mon, 24 May 2021 08:37:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqU+CaBuSKL292jj4yFkiChXJASgpyY33LWdGEw0zd9VVi5czHvuSc1fQR25tuhVWfZfEQ X-Received: by 2002:a50:c352:: with SMTP id q18mr27165958edb.30.1621870655479; Mon, 24 May 2021 08:37:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621870655; cv=none; d=google.com; s=arc-20160816; b=BSDA2no91uyzgjJackwtmyTSlQcHfJkTLNbqb+5axG/niR2IL34WvW4bnHGJoFhQNi /up7Vw368S1N1GVkgLkfXmUlLlQmpS/A08aFgivgEOa1RdlQWpU5GVjGJSSPnQVAXdV8 P547rRPvJmEhF4SdjSxyalizLCTHNi/jSXO1sE8OixHOga6iYjv+ZUEn7qLkP5eZBWfG So/XqeryNoFQmjuTQqHuTroQgaT+wbRxsRK1JX5E1CF/zGSxXjq2PXQNvRgJkEhphpdF ttPkqJa/wrJu4Xubg56aBf1vWDo0iWs8oFRFVSVm9GJDwGWupISNAYOmMP+uk8YRjJZ3 021w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xQJLwARDd/oLCbzfpoWAKP94zlv/xu1xLP6TH0LlHT4=; b=gmGEadV065B2fHYDRVGNTg30jzvriZexad8a0er0Px0Nuii5A6Dwsn6I8rOqz5D91T voRN3tCjEV6mfOjoQwlxS6MnnpnTGvmxioXbnHUrDRezboCIIeahFhyOlUXNFIlaMlXq pBuUenDek+hnHmV/H/bramldKGLwbPeXEGrwKbVttdhkhX2Y837itW2Idhvglo3EU5UK L8qG5qz4ZZfYAT19QBbc5AOTztg08S1GDHrjFRwwnW5BszrMoz2Yqzh/0FPwCofkCXYk bRkiFpmzous4DcxbnQ3zz3qxpY22ic/lDZyA9pk8FIhLVOygMKFslv1Nl95KOhVA/ucm 0mEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iozSkTwx; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r24si15384176ejy.134.2021.05.24.08.37.35; Mon, 24 May 2021 08:37:35 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iozSkTwx; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234161AbhEXPjB (ORCPT + 12 others); Mon, 24 May 2021 11:39:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:50532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234000AbhEXPg7 (ORCPT ); Mon, 24 May 2021 11:36:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BE7A961132; Mon, 24 May 2021 15:33:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621870388; bh=g//2zAzgU47EP/+ANJ3eRiack64Vlh2dUKvGyvS7ges=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iozSkTwxexHcyFrzIrzBXJ/1Og4Rh5z271NQzqY77rxLLg3EjJmlAlBgyhTSIg3dj GT4Ovug6qct//s68P+5K9nVQj0gOooHAcH/kAw7pisprnatRpLYerlFt2adI2L3EI/ fFNCl6QI3iobO61CCv3KnLbtrxkq6PQucZ818tqs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Himanshu Madhani , Zhen Lei , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.14 03/37] scsi: qla2xxx: Fix error return code in qla82xx_write_flash_dword() Date: Mon, 24 May 2021 17:25:07 +0200 Message-Id: <20210524152324.311595363@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524152324.199089755@linuxfoundation.org> References: <20210524152324.199089755@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit 5cb289bf2d7c34ca1abd794ce116c4f19185a1d4 ] Fix to return a negative error code from the error handling case instead of 0 as done elsewhere in this function. Link: https://lore.kernel.org/r/20210514090952.6715-1-thunder.leizhen@huawei.com Fixes: a9083016a531 ("[SCSI] qla2xxx: Add ISP82XX support.") Reported-by: Hulk Robot Reviewed-by: Himanshu Madhani Signed-off-by: Zhen Lei Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_nx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index a5b8313cf491..83cfbaa7f2fd 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c @@ -1107,7 +1107,8 @@ qla82xx_write_flash_dword(struct qla_hw_data *ha, uint32_t flashaddr, return ret; } - if (qla82xx_flash_set_write_enable(ha)) + ret = qla82xx_flash_set_write_enable(ha); + if (ret < 0) goto done_write; qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_WDATA, data);