Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp836511pxu; Mon, 23 Nov 2020 05:32:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDMdi24vFEYFRwF9MIJNGgw9TOMlKPmqwfZHW1lqBeGQQHq+SzClvRh+35Z20/S7OsCV27 X-Received: by 2002:a17:907:20ac:: with SMTP id pw12mr16068747ejb.245.1606138332650; Mon, 23 Nov 2020 05:32:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606138332; cv=none; d=google.com; s=arc-20160816; b=vlhwT4E6hXvm124Wp+ryr5mvnAKs9eyebtpXBqtVLQ5uquTv5Jc6fvUkKjL6r/hOor qkiHF5pMN0qRLQy3wBpXnD2HfIVychdIFgnx3nVdGk02ifOKul8lV6i4V2FuAaoN5UmA IJe4y7HqtO8gQiyHSLG5/EpNu9Hj4/wAFEexLnICuOx/MH9bPhHVadIYDF4y/sUrSJeU RmQuubd6GyQfcFbkbvbrLy3DEqt520beJfKU9ejBqoNZrMl8QjGOeyWaALSqvyp/1r3h CpnFdnUzKz51ChGLrP+nApXOaaDXSQfkcR07jaGHe5xMtLMogBE0ThmUhWuTCpacZ5fe 1EwQ== 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=YKP1bFOdfxWm/V0KmbFpuXuJRhDdTMClCQokpJkbdNc=; b=Md93VBLRXHnY6CZ2Bo9nAWoBEWMl4sZp0LJ+fzfaLzl/trPGl6coHjU8k5pTuWLhka NRPO42uThOzx23paDiBLDc5LwOEBAcZ13v4AkauJl2GveIJ/AwqXju4L9b8qG6ar7P59 tTvlrK90dxr/gZAdgLpH9dKY2D9JszElLNzraiamA/YMHbwjK27yqjfIOmHG6H4OMA09 XHYlLM1CuES6d+J5RbceLH571a8UXPlSdxkKLT7AcMK4MTtoKGVUm2pPmclIXi0IFhWa LzO33oBVx2kRuE7G7fuzF8wkFNIH6n55iMACwAMTArcpkwz2xL1hPsQUfU2saO7rgMMN VJ4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DZsHjIaB; 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 i7si6474207ejc.568.2020.11.23.05.31.49; Mon, 23 Nov 2020 05:32:12 -0800 (PST) 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=DZsHjIaB; 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 S1730710AbgKWMaQ (ORCPT + 99 others); Mon, 23 Nov 2020 07:30:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:40912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730698AbgKWMaJ (ORCPT ); Mon, 23 Nov 2020 07:30:09 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7959320728; Mon, 23 Nov 2020 12:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1606134609; bh=X//zobSDZ3L331AYD4tAv4j4HKY0XYtevooqjRZONoM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DZsHjIaBoCaF5bD6bab+yKj9SU4a5f2oelCrwdtcplrPp3rt0ka7sty8zVfr9uDiG BEL5RegGRQurZduklk/oevDOEAo9d+UsQA6uME70+8uLyKA8WjadjiFNEdHZ6CNNfQ CuBRgwId54pMJsw21EL9xjIGBUCxfBa/Web8QFoY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhang Changzhong , Jakub Kicinski Subject: [PATCH 4.19 20/91] qlcnic: fix error return code in qlcnic_83xx_restart_hw() Date: Mon, 23 Nov 2020 13:21:40 +0100 Message-Id: <20201123121810.290411594@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201123121809.285416732@linuxfoundation.org> References: <20201123121809.285416732@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: Zhang Changzhong [ Upstream commit 3beb9be165083c2964eba1923601c3bfac0b02d4 ] Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 3ced0a88cd4c ("qlcnic: Add support to run firmware POST") Reported-by: Hulk Robot Signed-off-by: Zhang Changzhong Link: https://lore.kernel.org/r/1605248186-16013-1-git-send-email-zhangchangzhong@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c @@ -2251,7 +2251,8 @@ static int qlcnic_83xx_restart_hw(struct /* Boot either flash image or firmware image from host file system */ if (qlcnic_load_fw_file == 1) { - if (qlcnic_83xx_load_fw_image_from_host(adapter)) + err = qlcnic_83xx_load_fw_image_from_host(adapter); + if (err) return err; } else { QLC_SHARED_REG_WR32(adapter, QLCNIC_FW_IMG_VALID,