From: Linas Vepstas Date: Thu, 31 Aug 2006 21:27:48 +0000 (-0700) Subject: e100: fix error recovery X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b1d26f24e864204dfaa82b1252477e981ba9ef24;p=mv-sheeva.git e100: fix error recovery A recent patch in -mm3 titled "gregkh-pci-pci-don-t-enable-device-if-already-enabled.patch" causes pci_enable_device() to be a no-op if the kernel thinks that the device is already enabled. This change breaks the PCI error recovery mechanism in the e100 device driver, since, after PCI slot reset, the card is no longer enabled. This is a trivial fix for this problem. Tested. Signed-off-by: Linas Vepstas Signed-off-by: Andrew Morton Signed-off-by: Auke Kok --- diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 458af6a80bb..e12cc68deaa 100644 --- a/drivers/net/e100.c +++ b/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;