Commit 3e322474 authored Sep 25, 2018 by Andrew Lunn Committed by David S. Miller Sep 26, 2018

net: phy: sfp: Fix unregistering of HWMON SFP device



A HWMON device is only registered is the SFP module supports the
diagnostic page and is complient to SFF8472. Don't unconditionally
unregister the hwmon device when the SFP module is remove, otherwise
we access data structures which don't exist.

Reported-by: Florian Fainelli <f.fainelli@gmail.com>
Fixes: 1323061a ("net: phy: sfp: Add HWMON support for module sensors")
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 77f2d753

drivers/net/phy/sfp.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1098,9 +1098,12 @@ static int sfp_hwmon_insert(struct sfp *sfp)

		static void sfp_hwmon_remove(struct sfp *sfp)
		{
		if (!IS_ERR_OR_NULL(sfp->hwmon_dev)) {
		hwmon_device_unregister(sfp->hwmon_dev);
		sfp->hwmon_dev = NULL;
		kfree(sfp->hwmon_name);
		}
		}
		#else
		static int sfp_hwmon_insert(struct sfp *sfp)
		{

Admin message