diff options
| author |   Hubert Chaumette <hchaumette@adeneo-embedded.com> | 2014-04-22 15:01:04 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-04-23 14:58:58 -0400 |
| commit | 6a1197457f9ec085871d2f842e1bbbe9d13216da (patch) | |
| tree | 299f154b255bfc8d178e158a2db6a95137d80a91 /drivers/net/phy/micrel.c | |
| parent | hisax/icc: add missing semicolon after label (diff) | |
| download | linux-dev-6a1197457f9ec085871d2f842e1bbbe9d13216da.tar.xz linux-dev-6a1197457f9ec085871d2f842e1bbbe9d13216da.zip | |
net/phy: micrel: fix bugged test on device tree loading for ksz9021
In ksz9021_load_values_from_of() val2 to val4 aren't tested against their
initialization value.
This causes the test to always succeed, and this value to be used as if it
was loaded from the devicetree instead of being ignored, in case of a
missing/invalid property in the ethernet OF device node.
As a result, the value "0" is written to the relevant registers.
Change the conditions to test against the right initialization value.
Signed-off-by: Hubert Chaumette <hchaumette@adeneo-embedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/phy/micrel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 5ad971a55c5d..d849684231c1 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -246,13 +246,13 @@ static int ksz9021_load_values_from_of(struct phy_device *phydev, if (val1 != -1) newval = ((newval & 0xfff0) | ((val1 / PS_TO_REG) & 0xf) << 0); - if (val2 != -1) + if (val2 != -2) newval = ((newval & 0xff0f) | ((val2 / PS_TO_REG) & 0xf) << 4); - if (val3 != -1) + if (val3 != -3) newval = ((newval & 0xf0ff) | ((val3 / PS_TO_REG) & 0xf) << 8); - if (val4 != -1) + if (val4 != -4) newval = ((newval & 0x0fff) | ((val4 / PS_TO_REG) & 0xf) << 12); return kszphy_extended_write(phydev, reg, newval); |