From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Lunn Subject: Re: [PATCH net] net: phy: sfp: Fix unregistering of HWMON SFP device Date: Tue, 25 Sep 2018 01:46:44 +0200 Message-ID: <20180924234644.GE17444@lunn.ch> References: <1537828692-22861-1-git-send-email-andrew@lunn.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: David Miller , netdev , Russell King To: Florian Fainelli Return-path: Received: from vps0.lunn.ch ([185.16.172.187]:44126 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725843AbeIYFvr (ORCPT ); Tue, 25 Sep 2018 01:51:47 -0400 Content-Disposition: inline In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: On Mon, Sep 24, 2018 at 03:43:33PM -0700, Florian Fainelli wrote: > On 09/24/2018 03:38 PM, Andrew Lunn wrote: > > 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 > > Fixes: 1323061a018a ("net: phy: sfp: Add HWMON support for module sensors") > > Signed-off-by: Andrew Lunn > > --- > > drivers/net/phy/sfp.c | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c > > index 52fffb98fde9..23705ffae6bb 100644 > > --- a/drivers/net/phy/sfp.c > > +++ b/drivers/net/phy/sfp.c > > @@ -1098,8 +1098,11 @@ static int sfp_hwmon_insert(struct sfp *sfp) > > > > static void sfp_hwmon_remove(struct sfp *sfp) > > { > > - hwmon_device_unregister(sfp->hwmon_dev); > > - kfree(sfp->hwmon_name); > > + if (!PTR_ERR_OR_NULL(sfp->hwmon_dev)) { > > I believe this should be IS_ERR_OR_NULL(), there is no PTR_ERR_OR_NULL() > in the Linux tree AFAICT. Yep. Please ignore this patch. Andrew