| From 3256929044cae03fdab2bf8d5a7fa722d72cf4d6 Mon Sep 17 00:00:00 2001 |
| From: Mao Wenan <maowenan@huawei.com> |
| Date: Fri, 22 Feb 2019 14:57:23 +0800 |
| Subject: net: set static variable an initial value in atl2_probe() |
| |
| [ 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 77a1c03255de..225b4d452e0e 100644 |
| --- a/drivers/net/ethernet/atheros/atlx/atl2.c |
| +++ b/drivers/net/ethernet/atheros/atlx/atl2.c |
| @@ -1334,13 +1334,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 |
| |
