Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2741420imj; Mon, 11 Feb 2019 07:48:37 -0800 (PST) X-Google-Smtp-Source: AHgI3IZeHuYfrcI5GeXsG2wiSbIARGXK/CC5FB4KhdGb+L7WtBDnkMlIWMmil1HB0pKEIwnBvyqK X-Received: by 2002:a17:902:a411:: with SMTP id p17mr37761946plq.292.1549900117316; Mon, 11 Feb 2019 07:48:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549900117; cv=none; d=google.com; s=arc-20160816; b=iV8yARpYifxM9PZse8s151IH3iFJ6417L1X/UUWtsQfYjWWdYxG9Te3wHrCLwYIX/m ugIp14OKBG6X1n0AN9y3EzrF8TD2KBBlr4JtXSx+7cgvWzM0V5YnqFEroZ3Rb21YHNDp LbhVCbDv5e0mD+ouIqP37M/GzWpn7p5bM5UpbZobJ85Zzxn7E8eAHkk47h7rcpQ84knI apBiC927bUCHxVL1Ebqkq6Aa9k8jjwzwqPhG5RssfB8u5ViCRPqkBs+MJEnyqsGSfn5q JheNXfgFznPbBOAQT8uH1DA4tUbr046MdR3sEPsfZKfjaqmcUY0nx0uT03pzQapyUavF R0TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Y1/E8gIN5MFPau5EM8tG0okSo85GfrJ6f2hJ9yLI78E=; b=NFK7drGYHsOsadzzOWNahKwD82eyxrrFySBUc7AUrmSgDLbbc+av04kBGeYgIsDfMX J8nf332qpm1aYu0OzOeJtsO5s9Iiqawqfo36spkx6vqFNywrSmj1ptoxJvXNBeA4R+nd V0qeWPr0bLDt77AXiuLwiDhM6ps3m9D7MnanO2u64kzv+9RZXS3nUYZJnxPq4jEQ8pVl QCrYrdP+8ImRNrrgHYZn4Kr2XHx+9pTnN8DAxXljXyojNS5RTXVs53mqa5+Vq1Z4Y2Bb 39ev2HXaPdCJJPbvRo7QhWc1dH5a8CoNxEaY6nmcLT3Si4q9q27spFYqNevYgdS5wvLd DUxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="nGo/V2hv"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u2si9970099pgo.544.2019.02.11.07.48.20; Mon, 11 Feb 2019 07:48:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="nGo/V2hv"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732744AbfBKPr2 (ORCPT + 99 others); Mon, 11 Feb 2019 10:47:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:52996 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732272AbfBKOlj (ORCPT ); Mon, 11 Feb 2019 09:41:39 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 8824120838; Mon, 11 Feb 2019 14:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549896099; bh=FHB90N5fEfZP/zDYrFDSsltrq4qE/bqFm9wauKsl3zA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nGo/V2hvHV0vSerGHoueKolNmLpCN+xJGViUuvBo6bReFpQw3kvil0JObuIyILUe2 nKrZC/TkpAPdWOEk0o02FSGSKJKDvvpZ0cZc9+fDXdAkh+RWwz8mAbiWJhtfr0ZwCX Nj1glSVF2ea/ZiO63WHi3vPamucG+cnwlaDNMVmc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 073/313] net: aquantia: return err if set MPI_DEINIT state fails Date: Mon, 11 Feb 2019 15:15:53 +0100 Message-Id: <20190211141858.770364628@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141852.749630980@linuxfoundation.org> References: <20190211141852.749630980@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 4e3c7c00bba0636b97eb23d582c20b0f5d95ce20 ] Fixes gcc '-Wunused-but-set-variable' warning: drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c:260:7: warning: variable 'err' set but not used [-Wunused-but-set-variable] 'err' should be returned while set MPI_DEINIT state fails in hw_atl_utils_soft_reset. Fixes: cce96d1883da ("net: aquantia: Regression on reset with 1.x firmware") Signed-off-by: YueHaibing Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c index c965e65d07db..9939ccaeb125 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c @@ -262,6 +262,8 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self) AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_MPI_STATE_ADR) & HW_ATL_MPI_STATE_MSK) == MPI_DEINIT, 10, 1000U); + if (err) + return err; } if (self->rbl_enabled) -- 2.19.1