From 1ecd63a3b0ec41e74e6dde0009cb3f69a3620f67 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 27 Jul 2012 20:48:36 +0100 Subject: [PATCH] --- yaml --- r: 327704 b: refs/heads/master c: b812f8b7a9b657367eaacab8c34e6711a657a48b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sfc/efx.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 66a391d0af97..df5e75cbb44e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b7325b4e29256881117aff8a162e829c79b47e9 +refs/heads/master: b812f8b7a9b657367eaacab8c34e6711a657a48b diff --git a/trunk/drivers/net/ethernet/sfc/efx.c b/trunk/drivers/net/ethernet/sfc/efx.c index 977fc3a591e9..5555e9f98162 100644 --- a/trunk/drivers/net/ethernet/sfc/efx.c +++ b/trunk/drivers/net/ethernet/sfc/efx.c @@ -2311,11 +2311,8 @@ static void efx_reset_work(struct work_struct *data) /* If we're not READY then don't reset. Leave the reset_pending * flags set so that efx_pci_probe_main will be retried */ - if (efx->state != STATE_READY) { - netif_info(efx, drv, efx->net_dev, - "scheduled reset quenched; NIC not ready\n"); + if (efx->state != STATE_READY) return; - } rtnl_lock(); (void)efx_reset(efx, fls(pending) - 1); @@ -2703,6 +2700,8 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev, * probably hosed anyway. */ if (efx->reset_pending) { + netif_err(efx, probe, efx->net_dev, + "aborting probe due to scheduled reset\n"); rc = -EIO; goto fail4; }