---

yaml --- r: 190375 b: refs/heads/master c: f49a458 h: refs/heads/master i: 190373: 0764381 190371: 36d801e 190367: fd8564b v: v3
git-mirror · Apr 28, 2010 · 08163dd · 08163dd
1 parent 6a5e984
commit 08163dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aabc5649078310094cbffb430fcbf9c25b6268f9
+refs/heads/master: f49a4589e9e25ef525da449b1ce5597cb659bbb5
diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
@@ -1861,6 +1861,7 @@ int efx_reset(struct efx_nic *efx, enum reset_type method)
 	}
 
 	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();
 }