Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3546030pxj; Mon, 24 May 2021 09:05:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz98XjLR0wNelPS+P74aaF1TT0hPUVnvGNLTGMFuwT2Di5MtS6e1pHcNzIHPMfYRHccb56r X-Received: by 2002:a05:6e02:2188:: with SMTP id j8mr18367269ila.194.1621872325307; Mon, 24 May 2021 09:05:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621872325; cv=none; d=google.com; s=arc-20160816; b=UAKQKySH6EoL/zwEKsig2bfifEnOCHHQo4Kln7VZ8btNF0aMKfZwpo3zIdiqfg8six JsQaXef+4EuiqWDg5Jp9MkQD0VVDSEztbjMAxjrkisfKEbvJRtf7w4DrU+idOwWBHAmP FVZ9fceAvs/17CYiZsgNaSAOgwdHoV7eo2ase6mxGNx3Q6uOOlfUnOWTGyeMlJMUQHjm iEHpzGbMUe3B3zaMg8oMATroYIiAr89APnHyRSgoHME77OgQhi3i0GSQf8wyUPmKVNHi 5N33baXcCGlHKL2Tne1X13K+3C5ueNxwDFIm370bY0JCdDRaxZFsXa+5/nWX2mG3A5dm a4ww== 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=dBePHLKvhjKoF+ZPdoKZcuyIl0XPdJkqLlBXGd4ZRGM=; b=vY2r0CMu38msydqApeH6XT/LRvAI4ySDceoFO8s/8KcEib8hBQW4qyUl+m7bQimteh ti51o/XSTgryIaUKfwxr8roBiuQn4ywN1apJIBVgtlygGAzZ86otEuiKTHk8VMmT0G1u O1bwAheGmst8cMXK/YCTNkhNpQE1U/UcuZv1E9DDhWcW1ev6LKZwSyLKTRJ3jVW5pSZJ xNBX6up6S4uhUofheDt3CEzEjMaZP2E/k1HsU70Wu482zmcQ8XBJ4JTvYUtbxz3xjKiB 1w+WjbVkVJfiQ3GM7bYVburoIZpPXof9MJkej9jyc0jkIB8nQrlW4cq7XLzC7ZvZGz58 NcCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YTyXTemC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 y17si12539021jak.57.2021.05.24.09.05.06; Mon, 24 May 2021 09:05:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=YTyXTemC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S236871AbhEXQEk (ORCPT + 99 others); Mon, 24 May 2021 12:04:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:41136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235485AbhEXP6J (ORCPT ); Mon, 24 May 2021 11:58:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BD6D061965; Mon, 24 May 2021 15:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621871042; bh=tLit2fks7rXXXfgitzjpcmmAtQRcj2PjNJMhFUkd6tk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YTyXTemCURanICd3XqwzeKq3q+0aE11NJwh84fls6R3N4zr6lvP+BxRud671bJkLF aAZIZgbKBG+sJC4z7qxlDTyGZpUWoCGIWviqRhzKXWA3hPgFd1QbI31EbWlgjbdFvR UdB4x8glORcyjw1s5T+GZLC06NntIdhfxnOuMuwU= 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 5.12 012/127] scsi: qla2xxx: Fix error return code in qla82xx_write_flash_dword() Date: Mon, 24 May 2021 17:25:29 +0200 Message-Id: <20210524152335.270424557@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524152334.857620285@linuxfoundation.org> References: <20210524152334.857620285@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 0677295957bc..615e44af1ca6 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c @@ -1063,7 +1063,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); -- 2.30.2