Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe870c77 authored by Netanel Belgazal's avatar Netanel Belgazal Committed by David S. Miller
Browse files

net: ena: fix potential double ena_destroy_device() 



ena_destroy_device() can potentially be called twice.
To avoid this, check that the device is running and
only then proceed destroying it.

Signed-off-by: default avatarNetanel Belgazal <netanel@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cfa324a5

drivers/net/ethernet/amazon/ena/ena_netdev.c

+5 −0
Original line number Diff line number Diff line
@@ -2556,6 +2556,9 @@ static void ena_destroy_device(struct ena_adapter *adapter, bool graceful) 
	struct ena_com_dev *ena_dev = adapter->ena_dev;

	bool dev_up;



	if (!test_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags))

		return;



	netif_carrier_off(netdev);



	del_timer_sync(&adapter->timer_service);
@@ -2592,6 +2595,7 @@ static void ena_destroy_device(struct ena_adapter *adapter, bool graceful) 
	adapter->reset_reason = ENA_REGS_RESET_NORMAL;



	clear_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags);

	clear_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);

}



static int ena_restore_device(struct ena_adapter *adapter)
@@ -2636,6 +2640,7 @@ static int ena_restore_device(struct ena_adapter *adapter) 
		}

	}



	set_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);

	mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));

	dev_err(&pdev->dev, "Device reset completed successfully\n");