lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 109/280] net: set static variable an initial value in atl2_probe()
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 4593403fa516a5a4cffe6883c5062d60932cbfbe ]

    cards_found is a static variable, but when it enters atl2_probe(),
    cards_found is set to zero, the value is not consistent with last probe,
    so next behavior is not our expect.

    Signed-off-by: Mao Wenan <maowenan@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/atheros/atlx/atl2.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
    index bb41becb6609..31ff1e0d1baa 100644
    --- a/drivers/net/ethernet/atheros/atlx/atl2.c
    +++ b/drivers/net/ethernet/atheros/atlx/atl2.c
    @@ -1335,13 +1335,11 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
    {
    struct net_device *netdev;
    struct atl2_adapter *adapter;
    - static int cards_found;
    + static int cards_found = 0;
    unsigned long mmio_start;
    int mmio_len;
    int err;

    - cards_found = 0;
    -
    err = pci_enable_device(pdev);
    if (err)
    return err;
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-22 13:44    [W:4.134 / U:24.688 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site