diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2016-01-26 15:12:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-29 01:07:32 +0100 |
| commit | 6ed742363b9c3d1d038f013591d57a606ae2c261 (patch) | |
| tree | 08e6525c8b92236ccaf8ca2bd9394d8ef5673f11 /drivers/of | |
| parent | Merge tag 'mac80211-for-davem-2016-01-26' of git://git.kernel.org/pub/scm/lin... (diff) | |
| download | linux-6ed742363b9c3d1d038f013591d57a606ae2c261.tar.xz linux-6ed742363b9c3d1d038f013591d57a606ae2c261.zip | |
of: of_mdio: Ensure mdio device is a PHY
of_phy_find_device() is used to find the phy device associated with a
device node. It is expected the node is for a PHY device, but in fact
it could of been probed as a generic MDIO device. Ensure the device is
a PHY before returning it.
Fixes: a9049e0c513c ("mdio: Add support for mdio drivers.")
Reported-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Reported-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/of_mdio.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index 86829f8064a6..b5aa004a24b6 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -256,11 +256,19 @@ static int of_phy_match(struct device *dev, void *phy_np) struct phy_device *of_phy_find_device(struct device_node *phy_np) { struct device *d; + struct mdio_device *mdiodev; + if (!phy_np) return NULL; d = bus_find_device(&mdio_bus_type, NULL, phy_np, of_phy_match); - return d ? to_phy_device(d) : NULL; + if (d) { + mdiodev = to_mdio_device(d); + if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY) + return to_phy_device(d); + } + + return NULL; } EXPORT_SYMBOL(of_phy_find_device); |