]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net: sfp: move sfp_register_socket call from sfp_remove to sfp_probe
authorMarek Behún <marek.behun@nic.cz>
Fri, 5 Apr 2019 09:07:58 +0000 (11:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Apr 2019 06:37:42 +0000 (08:37 +0200)
commitf5393c36705010563a97e3a73e28ace83ff515e0
treeadfeea8e8ad7e3acf2f8fbc7591decff51fb8d53
parent1ec8f1f0bffe34ebdf95dbe0fd4a6635a84612a8
net: sfp: move sfp_register_socket call from sfp_remove to sfp_probe

Commit c4ba68b8691e4 backported from upstream to 4.14 stable was
probably applied wrongly, and instead of calling sfp_register_socket in
sfp_probe, the socket registering code was put into sfp_remove. This is
obviously wrong.

The commit first appeared in 4.14.104. Fix it for the next 4.14 release.

Fixes: c4ba68b8691e4 ("net: sfp: do not probe SFP module before we're attached")
Cc: stable <stable@vger.kernel.org>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: David S. Miller <davem@davemloft.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/phy/sfp.c