summaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2014-03-19 02:58:16 +0300
committerDavid S. Miller <davem@davemloft.net>2014-03-19 17:41:50 -0400
commit28bdc499d647124fa5844453d35e6f5d1b3810dc (patch)
tree0fb29b75fe86ebaaf92c84aa2288c548f98d9b0f /drivers/net/phy
parent3ab428a4c5ad929f93f9742d2a222ae33c242c3d (diff)
downloadlinux-28bdc499d647124fa5844453d35e6f5d1b3810dc.tar.bz2
micrel: fix masking off LED bits
Commit 20d8435a1cff (phy: micrel: add of configuration for LED mode) made the obvious mistake when masking off the LED mode bits: forgot to do a logical NOT to the mask with which it ANDs the register value, so that unrelated bits are cleared instead. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Ben Dooks <ben.dooks@codethink.co.uk> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/micrel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 0c9e4342f11d..5ad971a55c5d 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -167,7 +167,7 @@ static int kszphy_setup_led(struct phy_device *phydev,
if (temp < 0)
return temp;
- temp &= 3 << shift;
+ temp &= ~(3 << shift);
temp |= val << shift;
rc = phy_write(phydev, reg, temp);