Commit 2148927e authored by Marek Behún's avatar Marek Behún Committed by David S. Miller
Browse files

net: sfp: ignore disabled SFP node 



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 # 2203cbf2 ("net: sfp: move fwnode parsing into sfp-bus layer")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent afa114d9

drivers/net/phy/sfp-bus.c

+5 −0
Original line number Diff line number Diff line
@@ -651,6 +651,11 @@ struct sfp_bus *sfp_bus_find_fwnode(struct fwnode_handle *fwnode) 
	else if (ret < 0)

		return ERR_PTR(ret);



	if (!fwnode_device_is_available(ref.fwnode)) {

		fwnode_handle_put(ref.fwnode);

		return NULL;

	}



	bus = sfp_bus_get(ref.fwnode);

	fwnode_handle_put(ref.fwnode);

	if (!bus)