From: Andrew Lunn <andrew@lunn.ch>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net,
rmk+kernel@armlinux.org.uk, maowenan@huawei.com
Subject: Re: [PATCH net v2 1/3] net: phy: Fix PHY module checks
Date: Wed, 8 Feb 2017 17:57:13 +0100 [thread overview]
Message-ID: <20170208165713.GD13281@lunn.ch> (raw)
In-Reply-To: <20170208073746.10963-2-f.fainelli@gmail.com>
> --- a/drivers/net/phy/phy_device.c
> +++ b/drivers/net/phy/phy_device.c
> @@ -920,7 +920,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
> return -EIO;
> }
>
> - if (!try_module_get(d->driver->owner)) {
> + if (d->driver && !try_module_get(d->driver->owner)) {
> dev_err(&dev->dev, "failed to get the device driver module\n");
> return -EIO;
> }
> @@ -943,7 +943,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
> err = device_bind_driver(d);
>
> if (err)
> - goto error;
> + goto error_put_device;
> }
>
> if (phydev->attached_dev) {
> @@ -981,6 +981,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
>
> error:
> phy_detach(phydev);
> +error_put_device:
> put_device(d);
> module_put(d->driver->owner);
Can we get into problems here? Maybe we did not do a get?
> if (ndev_owner != bus->owner)
> @@ -1065,7 +1066,8 @@ void phy_detach(struct phy_device *phydev)
> bus = phydev->mdio.bus;
>
> put_device(&phydev->mdio.dev);
> - module_put(phydev->mdio.dev.driver->owner);
> + if (phydev->mdio.dev.driver)
> + module_put(phydev->mdio.dev.driver->owner);
Humm. By this point, havn't we assigned d->driver to genphy_driver?
So this decrements something we never incremented?
To me, it seems better to move the try_module_get() after assigning
genphy_driver if needed. We then don't have any special conditions.
Andrew
next prev parent reply other threads:[~2017-02-08 17:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 7:37 [PATCH net v2 0/3] net: phy: Unbind/bind fixes Florian Fainelli
2017-02-08 7:37 ` [PATCH net v2 1/3] net: phy: Fix PHY module checks Florian Fainelli
2017-02-08 7:57 ` maowenan
2017-02-08 17:46 ` Florian Fainelli
2017-02-08 16:46 ` Fabio Estevam
2017-02-08 16:57 ` Andrew Lunn [this message]
2017-02-08 17:55 ` Florian Fainelli
2017-02-08 7:37 ` [PATCH net v2 2/3] net: phy: Check phydev->drv Florian Fainelli
2017-02-08 7:37 ` [PATCH net v2 3/3] net: phy: Fix PHY driver bind and unbind events Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170208165713.GD13281@lunn.ch \
--to=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=maowenan@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).