Commit d65fbc4f authored Nov 24, 2018 by YueHaibing Committed by Greg Kroah-Hartman Feb 12, 2019

net: aquantia: return 'err' if set MPI_DEINIT state fails



[ 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: cce96d18 ("net: aquantia: Regression on reset with 1.x firmware")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent dd46de15

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)