From: Dean Nelson Date: Fri, 31 Jul 2009 09:13:48 +0000 (+0000) Subject: qlge: return PCI_ERS_RESULT_DISCONNECT on permanent failure X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fbc663ceeb7a48481a3b0290040528fbfd207282;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git qlge: return PCI_ERS_RESULT_DISCONNECT on permanent failure PCI drivers that implement the struct pci_error_handlers' error_detected callback should return PCI_ERS_RESULT_DISCONNECT if the state passed in is pci_channel_io_perm_failure. This patch fixes the issue for qlge. Signed-off-by: Dean Nelson Signed-off-by: David S. Miller --- diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 5768af17f168..3a271afdd8f5 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -4076,6 +4076,11 @@ static pci_ers_result_t qlge_io_error_detected(struct pci_dev *pdev, struct net_device *ndev = pci_get_drvdata(pdev); struct ql_adapter *qdev = netdev_priv(ndev); + netif_device_detach(ndev); + + if (state == pci_channel_io_perm_failure) + return PCI_ERS_RESULT_DISCONNECT; + if (netif_running(ndev)) ql_adapter_down(qdev);