From 92dfcb1be0c3b81a4b397d0fc52d132cc897ae30 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 2 Dec 2010 13:46:14 +0000
Subject: [PATCH] --- yaml --- r: 224761 b: refs/heads/master c:
 4484cd7dedecf59aee0775c6658f95bdee65f277 h: refs/heads/master i:   224759:
 4118034ac0dddcbb4aa2f06e60d15eecf3bd3d47 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/sfc/falcon_boards.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e44921104da0..a6ccd3529bd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f18ca364617d5e1fdd7300e025473496e397db4b
+refs/heads/master: 4484cd7dedecf59aee0775c6658f95bdee65f277
diff --git a/trunk/drivers/net/sfc/falcon_boards.c b/trunk/drivers/net/sfc/falcon_boards.c
index cfc6a5b5a477..cfc29d767588 100644
--- a/trunk/drivers/net/sfc/falcon_boards.c
+++ b/trunk/drivers/net/sfc/falcon_boards.c
@@ -325,7 +325,7 @@ static ssize_t set_phy_flash_cfg(struct device *dev,
 		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;