summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorShaohui Xie2015-01-13 03:30:31 +0100
committerDavid S. Miller2015-01-13 22:43:29 +0100
commite54bfe9d7e5823f8b460e8de371f695ada41a0c1 (patch)
treef963714f6d5c83bd845c2fd016e21c1c342a1759 /drivers/net/ethernet
parentbridge: fix uninitialized variable warning (diff)
downloadkernel-qcow2-linux-e54bfe9d7e5823f8b460e8de371f695ada41a0c1.tar.gz
kernel-qcow2-linux-e54bfe9d7e5823f8b460e8de371f695ada41a0c1.tar.xz
kernel-qcow2-linux-e54bfe9d7e5823f8b460e8de371f695ada41a0c1.zip
net/fsl: fix a bug in xgmac_mdio
There is a bug in xgmac_mdio_read when clear the bit MDIO_STAT_ENC, which '&' is missed in 'mdio_stat &= ~MDIO_STAT_ENC'. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/freescale/xgmac_mdio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c
index e0fc3d1115ea..a492e5006756 100644
--- a/drivers/net/ethernet/freescale/xgmac_mdio.c
+++ b/drivers/net/ethernet/freescale/xgmac_mdio.c
@@ -156,7 +156,7 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phy_id, int regnum)
mdio_stat |= MDIO_STAT_ENC;
} else {
dev_addr = regnum & 0x1f;
- mdio_stat = ~MDIO_STAT_ENC;
+ mdio_stat &= ~MDIO_STAT_ENC;
}
out_be32(&regs->mdio_stat, mdio_stat);