Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff19d70b authored by Marek Behún's avatar Marek Behún Committed by Greg Kroah-Hartman
Browse files

net: sfp: ignore disabled SFP node 



commit 2148927e6ed43a1667baf7c2ae3e0e05a44b51a0 upstream.

Commit ce0aa27f ("sfp: add sfp-bus to bridge between network devices
and sfp cages") added code which finds SFP bus DT node even if the node
is disabled with status = "disabled". Because of this, when phylink is
created, it ends with non-null .sfp_bus member, even though the SFP
module is not probed (because the node is disabled).

We need to ignore disabled SFP bus node.

Fixes: ce0aa27f ("sfp: add sfp-bus to bridge between network devices and sfp cages")
Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Cc: stable@vger.kernel.org # 2203cbf2c8b5 ("net: sfp: move fwnode parsing into sfp-bus layer")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
[ backport to 5.4 ]
Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ede72d4

drivers/net/phy/phylink.c

+5 −0
Original line number Diff line number Diff line
@@ -582,6 +582,11 @@ static int phylink_register_sfp(struct phylink *pl, 
		return ret;

	}



	if (!fwnode_device_is_available(ref.fwnode)) {

		fwnode_handle_put(ref.fwnode);

		return 0;

	}



	pl->sfp_bus = sfp_register_upstream(ref.fwnode, pl, &sfp_phylink_ops);

	if (!pl->sfp_bus)

		return -ENOMEM;