commit 4484cd7dedecf59aee0775c6658f95bdee65f277
author Ben Hutchings <bhutchings@solarflare.com> Thu Dec 02 13:46:14 2010 +0000
committer David S. Miller <davem@davemloft.net> Fri Dec 03 09:08:03 2010 -0800
tree 7f6f250c6c85e01ccc7cee67f6b5d728aa16bdf0
parent f18ca364617d5e1fdd7300e025473496e397db4b

sfc: Fix condition for no-op in set_phy_flash_cfg()

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

drivers/net/sfc/falcon_boards.c

diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c
index cfc6a5b..cfc29d7 100644
--- a/drivers/net/sfc/falcon_boards.c
+++ b/drivers/net/sfc/falcon_boards.c
@@ -325,7 +325,7 @@
 		new_mode = old_mode & ~PHY_MODE_SPECIAL;
 	else
 		new_mode = PHY_MODE_SPECIAL;
-	if (old_mode == new_mode) {
+	if (!((old_mode ^ new_mode) & PHY_MODE_SPECIAL)) {
 		err = 0;
 	} else if (efx->state != STATE_RUNNING || netif_running(efx->net_dev)) {
 		err = -EBUSY;