diff --git a/[refs] b/[refs] index 5990da8aff17..35bf10e78d31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4187592b6d2230d4f9f7177c369dde2aef1a4337 +refs/heads/master: b1d26f24e864204dfaa82b1252477e981ba9ef24 diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c index 458af6a80bbb..e12cc68deaa4 100644 --- a/trunk/drivers/net/e100.c +++ b/trunk/drivers/net/e100.c @@ -2791,6 +2791,7 @@ static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel /* Detach; put netif into state similar to hotplug unplug. */ netif_poll_enable(netdev); netif_device_detach(netdev); + pci_disable_device(pdev); /* Request a slot reset. */ return PCI_ERS_RESULT_NEED_RESET;