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

Commit 0471448f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc 

* 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
  phy: Fix phy_id for Vitesse 824x PHY
parents edd5cd4a 5f708dd9

drivers/net/phy/mdio_bus.c

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ static int mdio_bus_match(struct device *dev, struct device_driver *drv) 
	struct phy_device *phydev = to_phy_device(dev);

	struct phy_driver *phydrv = to_phy_driver(drv);



	return (phydrv->phy_id == (phydev->phy_id & phydrv->phy_id_mask));

	return ((phydrv->phy_id & phydrv->phy_id_mask) ==

		(phydev->phy_id & phydrv->phy_id_mask));

}



/* Suspend and resume.  Copied from platform_suspend and

drivers/net/phy/vitesse.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int vsc824x_config_intr(struct phy_device *phydev) 


/* Vitesse 824x */

static struct phy_driver vsc8244_driver = {

	.phy_id		= 0x000fc6c2,

	.phy_id		= 0x000fc6c0,

	.name		= "Vitesse VSC8244",

	.phy_id_mask	= 0x000fffc0,

	.features	= PHY_GBIT_FEATURES,