lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 086/352] net: aquantia: return err if set MPI_DEINIT state fails
    Date
    4.20-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 <yuehaibing@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 7def1cb8ab9d..22cbf8dc6fa9 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
    @@ -263,6 +263,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


    \
     
     \ /
      Last update: 2019-02-11 17:11    [W:4.103 / U:0.504 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site