---

yaml --- r: 171949 b: refs/heads/master c: 332c1ce h: refs/heads/master i: 171947: f9600a2 v: v3
git-mirror · Nov 26, 2009 · a663d39 · a663d39
1 parent 6b64f8e
commit a663d39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80cb9a0f7f381e1c0e9f6dabec6e67db0dd3a0d9
+refs/heads/master: 332c1ce9e7b0f9285cba0cf3d32bad87a4f8e40a
diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
@@ -186,7 +186,8 @@ static void efx_fini_channels(struct efx_nic *efx);
 
 #define EFX_ASSERT_RESET_SERIALISED(efx)		\
 	do {						\
-		if (efx->state == STATE_RUNNING)	\
+		if ((efx->state == STATE_RUNNING) ||	\
+		    (efx->state == STATE_DISABLED))	\
 			ASSERT_RTNL();			\
 	} while (0)