Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c129bf7 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: ethernet-rgmii.c: Fix breakage from moving phdev bus 



The mdio device patches moved the bus member in phy_device into a
substructure. This driver got missed. Fix it.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2a4fc4ea

drivers/staging/octeon/ethernet-rgmii.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) 
		 */

		 */

		spin_lock_irqsave(&global_register_lock, flags);

		spin_lock_irqsave(&global_register_lock, flags);

	} else {

	} else {

		mutex_lock(&priv->phydev->bus->mdio_lock);

		mutex_lock(&priv->phydev->mdio.bus->mdio_lock);

	}

	}





	link_info = cvmx_helper_link_get(priv->port);

	link_info = cvmx_helper_link_get(priv->port);
@@ -113,7 +113,7 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) 
		if (use_global_register_lock)

		if (use_global_register_lock)

			spin_unlock_irqrestore(&global_register_lock, flags);

			spin_unlock_irqrestore(&global_register_lock, flags);

		else

		else

			mutex_unlock(&priv->phydev->bus->mdio_lock);

			mutex_unlock(&priv->phydev->mdio.bus->mdio_lock);

		return;

		return;

	}

	}
@@ -132,7 +132,7 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) 
	if (use_global_register_lock)

	if (use_global_register_lock)

		spin_unlock_irqrestore(&global_register_lock, flags);

		spin_unlock_irqrestore(&global_register_lock, flags);

	else

	else

		mutex_unlock(&priv->phydev->bus->mdio_lock);

		mutex_unlock(&priv->phydev->mdio.bus->mdio_lock);





	if (priv->phydev == NULL) {

	if (priv->phydev == NULL) {

		/* Tell core. */

		/* Tell core. */