diff options
| author | Dan Murphy <dmurphy@ti.com> | 2015-07-21 19:06:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-22 07:29:31 +0200 |
| commit | a46fa260f6f5e8f80a725b28e4aee5a04d1bd79e (patch) | |
| tree | ddc9b4f6cba938e1383f21b90bc8c7851ccbe58c /drivers/net/phy/dp83867.c | |
| parent | openvswitch: allocate nr_node_ids flow_stats instead of num_possible_nodes (diff) | |
| download | linux-a46fa260f6f5e8f80a725b28e4aee5a04d1bd79e.tar.xz linux-a46fa260f6f5e8f80a725b28e4aee5a04d1bd79e.zip | |
net: phy: dp83867: Fix warning check for setting the internal delay
Fix warning: logical ‘or’ of collectively exhaustive tests is always true
Change the internal delay check from an 'or' condition to an 'and'
condition.
Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/dp83867.c')
| -rw-r--r-- | drivers/net/phy/dp83867.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c index c7a12e2e07b7..8a3bf5469892 100644 --- a/drivers/net/phy/dp83867.c +++ b/drivers/net/phy/dp83867.c @@ -164,7 +164,7 @@ static int dp83867_config_init(struct phy_device *phydev) return ret; } - if ((phydev->interface >= PHY_INTERFACE_MODE_RGMII_ID) || + if ((phydev->interface >= PHY_INTERFACE_MODE_RGMII_ID) && (phydev->interface <= PHY_INTERFACE_MODE_RGMII_RXID)) { val = phy_read_mmd_indirect(phydev, DP83867_RGMIICTL, DP83867_DEVADDR, phydev->addr); |