releases/4.19.31/net-set-static-variable-an-initial-value-in-atl2_pro.patch

   1 From 95d0dd5ad09b43ffd5d91892d35c44ad77377e3e Mon Sep 17 00:00:00 2001
   2 From: Mao Wenan <maowenan@huawei.com>
   3 Date: Fri, 22 Feb 2019 14:57:23 +0800
   4 Subject: net: set static variable an initial value in atl2_probe()
   5
   6 [ Upstream commit 4593403fa516a5a4cffe6883c5062d60932cbfbe ]
   7
   8 cards_found is a static variable, but when it enters atl2_probe(),
   9 cards_found is set to zero, the value is not consistent with last probe,
  10 so next behavior is not our expect.
  11
  12 Signed-off-by: Mao Wenan <maowenan@huawei.com>
  13 Signed-off-by: David S. Miller <davem@davemloft.net>
  14 Signed-off-by: Sasha Levin <sashal@kernel.org>
  15 ---
  16  drivers/net/ethernet/atheros/atlx/atl2.c | 4 +---
  17  1 file changed, 1 insertion(+), 3 deletions(-)
  18
  19 diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
  20 index bb41becb6609..31ff1e0d1baa 100644
  21 --- a/drivers/net/ethernet/atheros/atlx/atl2.c
  22 +++ b/drivers/net/ethernet/atheros/atlx/atl2.c
  23 @@ -1335,13 +1335,11 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
  24  {
  25         struct net_device *netdev;
  26         struct atl2_adapter *adapter;
  27 -       static int cards_found;
  28 +       static int cards_found = 0;
  29         unsigned long mmio_start;
  30         int mmio_len;
  31         int err;
  32
  33 -       cards_found = 0;
  34 -
  35         err = pci_enable_device(pdev);
  36         if (err)
  37                 return err;
  38 --
  39 2.19.1
  40