diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-02 08:46:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-03 12:08:03 -0500 |
commit | 4484cd7dedecf59aee0775c6658f95bdee65f277 (patch) | |
tree | 7f6f250c6c85e01ccc7cee67f6b5d728aa16bdf0 /drivers/net/sfc | |
parent | f18ca364617d5e1fdd7300e025473496e397db4b (diff) |
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/sfc')
-rw-r--r-- | drivers/net/sfc/falcon_boards.c | 2 |
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, | |||
325 | new_mode = old_mode & ~PHY_MODE_SPECIAL; | 325 | new_mode = old_mode & ~PHY_MODE_SPECIAL; |
326 | else | 326 | else |
327 | new_mode = PHY_MODE_SPECIAL; | 327 | new_mode = PHY_MODE_SPECIAL; |
328 | if (old_mode == new_mode) { | 328 | if (!((old_mode ^ new_mode) & PHY_MODE_SPECIAL)) { |
329 | err = 0; | 329 | err = 0; |
330 | } else if (efx->state != STATE_RUNNING || netif_running(efx->net_dev)) { | 330 | } else if (efx->state != STATE_RUNNING || netif_running(efx->net_dev)) { |
331 | err = -EBUSY; | 331 | err = -EBUSY; |