sfc: Always close net device at the end of a disabling reset
authorBen Hutchings <bhutchings@solarflare.com>
Wed, 28 Apr 2010 09:01:33 +0000 (09:01 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Apr 2010 19:18:26 +0000 (12:18 -0700)
This fixes a regression introduced by commit
eb9f6744cbfa97674c13263802259b5aa0034594 "sfc: Implement ethtool
reset operation".

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/sfc/efx.c

index 6486657c47b86ee4de771419d0f48b33d88fd196..649a264d6a81b80ee35f54850fce49a4545565c1 100644 (file)
@@ -1861,6 +1861,7 @@ out:
        }
 
        if (disabled) {
+               dev_close(efx->net_dev);
                EFX_ERR(efx, "has been disabled\n");
                efx->state = STATE_DISABLED;
        } else {
@@ -1884,8 +1885,7 @@ static void efx_reset_work(struct work_struct *data)
        }
 
        rtnl_lock();
-       if (efx_reset(efx, efx->reset_pending))
-               dev_close(efx->net_dev);
+       (void)efx_reset(efx, efx->reset_pending);
        rtnl_unlock();
 }