diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2017-08-04 11:17:21 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-08-04 10:55:54 -0700 |
| commit | 5987feb38aa55e035ce5376c02aba88a604cc881 (patch) | |
| tree | 04277f8d9b6056fff315c900bce3215ed866f9a6 | |
| parent | Merge branch 'socket-sendmsg-zerocopy' (diff) | |
| download | linux-dev-5987feb38aa55e035ce5376c02aba88a604cc881.tar.xz linux-dev-5987feb38aa55e035ce5376c02aba88a604cc881.zip | |
net: phy: marvell: logical vs bitwise OR typo
This was supposed to be a bitwise OR but there is a || vs | typo.
Fixes: 864dc729d528 ("net: phy: marvell: Refactor m88e1121 RGMII delay configuration")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/marvell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 361fe9927ef2..15cbcdba618a 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -83,7 +83,7 @@ #define MII_88E1121_PHY_MSCR_REG 21 #define MII_88E1121_PHY_MSCR_RX_DELAY BIT(5) #define MII_88E1121_PHY_MSCR_TX_DELAY BIT(4) -#define MII_88E1121_PHY_MSCR_DELAY_MASK (~(BIT(5) || BIT(4))) +#define MII_88E1121_PHY_MSCR_DELAY_MASK (~(BIT(5) | BIT(4))) #define MII_88E1121_MISC_TEST 0x1a #define MII_88E1510_MISC_TEST_TEMP_THRESHOLD_MASK 0x1f00 |