diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-24 17:19:00 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-24 17:19:00 (GMT) |
| commit | 4366004d77278a90c18f92f7cb9ec0c264da563d (patch) | |
| tree | 4fb046b6b06cc681f791a8ddf7507b5f8eb99be8 /drivers/net/phy | |
| parent | e9f0fb88493570200b8dc1cc02d3e676412d25bc (diff) | |
| parent | a450a685791d12c0a477b75d630d6ae66acab9a7 (diff) | |
| download | linux-4366004d77278a90c18f92f7cb9ec0c264da563d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/igb/e1000_mac.c
net/core/filter.c
Both conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -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 5ad971a..d849684 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); |