From c9b4d454e8cc74af42ac987bf62628341636c31c Mon Sep 17 00:00:00 2001 From: Steve Hodgson Date: Fri, 12 Dec 2008 22:08:16 -0800 Subject: [PATCH] --- yaml --- r: 122628 b: refs/heads/master c: fa402b2ea9cacd1ec94fa77e3efb506a5d034da6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/efx.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b056adf83738..9674e36d39c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab377358701a981e7fae1332e76b1e5d3b3b313d +refs/heads/master: fa402b2ea9cacd1ec94fa77e3efb506a5d034da6 diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c index ce1c7d3cd12e..8f832bf1e4d2 100644 --- a/trunk/drivers/net/sfc/efx.c +++ b/trunk/drivers/net/sfc/efx.c @@ -2112,8 +2112,6 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev, * we're in STATE_INIT. */ for (i = 0; i < 5; i++) { rc = efx_pci_probe_main(efx); - if (rc == 0) - break; /* Serialise against efx_reset(). No more resets will be * scheduled since efx_stop_all() has been called, and we @@ -2121,6 +2119,17 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev, * the rtnetlink or driverlink layers. */ cancel_work_sync(&efx->reset_work); + if (rc == 0) { + if (efx->reset_pending != RESET_TYPE_NONE) { + /* If there was a scheduled reset during + * probe, the NIC is probably hosed anyway */ + efx_pci_remove_main(efx); + rc = -EIO; + } else { + break; + } + } + /* Retry if a recoverably reset event has been scheduled */ if ((efx->reset_pending != RESET_TYPE_INVISIBLE) && (efx->reset_pending != RESET_TYPE_ALL))