net: phy: marvell: logical vs bitwise OR typo
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 4 Aug 2017 08:17:21 +0000 (11:17 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 4 Aug 2017 17:55:54 +0000 (10:55 -0700)
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>
drivers/net/phy/marvell.c

index 361fe9927ef2a98059da1b0d142e1e6c7959e5ba..15cbcdba618a81363765a78217f4d875518386cc 100644 (file)
@@ -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