summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-12-02 14:46:14 +0100
committerDavid S. Miller <davem@davemloft.net>2010-12-03 18:08:03 +0100
commit4484cd7dedecf59aee0775c6658f95bdee65f277 (patch)
tree7f6f250c6c85e01ccc7cee67f6b5d728aa16bdf0 /drivers/net
parentsfc: Reduce log level for MCDI error response in efx_mcdi_rpc() (diff)
downloadlinux-4484cd7dedecf59aee0775c6658f95bdee65f277.tar.xz
linux-4484cd7dedecf59aee0775c6658f95bdee65f277.zip
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sfc/falcon_boards.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c
index cfc6a5b5a477..cfc29d767588 100644
--- a/drivers/net/sfc/falcon_boards.c
+++ b/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;