commit 332c1ce9e7b0f9285cba0cf3d32bad87a4f8e40a
author Ben Hutchings <bhutchings@solarflare.com> Wed Nov 25 16:08:52 2009 +0000
committer David S. Miller <davem@davemloft.net> Thu Nov 26 15:59:04 2009 -0800
tree 543d0dddadb436ba6fc4f58ceb9e322796cd6ad3
parent 80cb9a0f7f381e1c0e9f6dabec6e67db0dd3a0d9

sfc: Strengthen EFX_ASSERT_RESET_SERIALISED

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/sfc/efx.c

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 4787faa..9f3ef38 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -186,7 +186,8 @@
 
 #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)