diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-12-14 15:57:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-15 13:50:49 -0500 |
| commit | 024778095aa340960fdfd7f7db293290454fbce2 (patch) | |
| tree | 79afc628f826cb760d3affcf2f208d0a4df22eed | |
| parent | 245d21190aec547c0de64f70c0e6de871c185a24 (diff) | |
| download | op-kernel-dev-024778095aa340960fdfd7f7db293290454fbce2.zip op-kernel-dev-024778095aa340960fdfd7f7db293290454fbce2.tar.gz | |
net: phy: phylink: Handle NULL fwnode_handle
Unlike the various of_* routines to fetch properties, fwnode_* routines can
have an early check against a NULL fwnode_handle reference which makes them
return -EINVAL (see fwnode_call_int_op), thus making it virtually impossible to
differentiate what type of error is going on.
Have an early check in phylink_register_sfp() so we can keep proceeding with
the initialization, there is not much we can do without a valid fwnode_handle
except return early and treat this similarly to -ENOENT.
Fixes: 8fa7b9b6af25 ("phylink: convert to fwnode")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/phylink.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index c89b8c6..69adc0a 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -506,6 +506,9 @@ static int phylink_register_sfp(struct phylink *pl, struct fwnode_reference_args ref; int ret; + if (!fwnode) + return 0; + ret = fwnode_property_get_reference_args(fwnode, "sfp", NULL, 0, 0, &ref); if (ret < 0) { |
