]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: phylink: fix failure to register on x86 systems
authorRussell King <rmk+kernel@armlinux.org.uk>
Fri, 3 Jan 2020 15:13:56 +0000 (15:13 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 3 Jan 2020 20:37:55 +0000 (12:37 -0800)
The kernel test robot reports a boot failure with qemu in 5.5-rc,
referencing commit 2203cbf2c8b5 ("net: sfp: move fwnode parsing into
sfp-bus layer"). This is caused by phylink_create() being passed a
NULL fwnode, causing fwnode_property_get_reference_args() to return
-EINVAL.

Don't attempt to attach to a SFP bus if we have no fwnode, which
avoids this issue.

Reported-by: kernel test robot <rong.a.chen@intel.com>
Fixes: 2203cbf2c8b5 ("net: sfp: move fwnode parsing into sfp-bus layer")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/phylink.c

index 1585eebb73feb79998731807809f522a08e2df11..ee7a718662c6b4d56da00ad947f85e50d86db537 100644 (file)
@@ -566,6 +566,9 @@ static int phylink_register_sfp(struct phylink *pl,
        struct sfp_bus *bus;
        int ret;
 
+       if (!fwnode)
+               return 0;
+
        bus = sfp_bus_find_fwnode(fwnode);
        if (IS_ERR(bus)) {
                ret = PTR_ERR(bus);