mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
net: ethernet: fix suspend/resume in davinci_emac
This patch reverts commit3243ff2a05
("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") and adds a comment which should stop anyone from reintroducing the same "fix" in the future. We can't use bus_find_device_by_name() here because the device name is not guaranteed to be 'davinci_mdio'. On some systems it can be 'davinci_mdio.0' so we need to use strncmp() against the first part of the string to correctly match it. Fixes:3243ff2a05
("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") Cc: stable@vger.kernel.org Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Acked-by: Lukas Wunner <lukas@wunner.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
7892bd0810
commit
dc45519eb1
1 changed files with 13 additions and 2 deletions
|
@ -1385,6 +1385,11 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd)
|
|||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static int match_first_device(struct device *dev, void *data)
|
||||
{
|
||||
return !strncmp(dev_name(dev), "davinci_mdio", 12);
|
||||
}
|
||||
|
||||
/**
|
||||
* emac_dev_open - EMAC device open
|
||||
* @ndev: The DaVinci EMAC network adapter
|
||||
|
@ -1484,8 +1489,14 @@ static int emac_dev_open(struct net_device *ndev)
|
|||
|
||||
/* use the first phy on the bus if pdata did not give us a phy id */
|
||||
if (!phydev && !priv->phy_id) {
|
||||
phy = bus_find_device_by_name(&mdio_bus_type, NULL,
|
||||
"davinci_mdio");
|
||||
/* NOTE: we can't use bus_find_device_by_name() here because
|
||||
* the device name is not guaranteed to be 'davinci_mdio'. On
|
||||
* some systems it can be 'davinci_mdio.0' so we need to use
|
||||
* strncmp() against the first part of the string to correctly
|
||||
* match it.
|
||||
*/
|
||||
phy = bus_find_device(&mdio_bus_type, NULL, NULL,
|
||||
match_first_device);
|
||||
if (phy) {
|
||||
priv->phy_id = dev_name(phy);
|
||||
if (!priv->phy_id || !*priv->phy_id)
|
||||
|
|
Loading…
Reference in a new issue