Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5f708dd91d15876e26d7a57f97a255cedffca463
Commit:     5f708dd91d15876e26d7a57f97a255cedffca463
Parent:     b75ae8603568ae18f270213693758c78fb8a29ff
Author:     Kumar Gala <[EMAIL PROTECTED]>
AuthorDate: Thu Jun 28 13:26:06 2007 -0500
Committer:  Kumar Gala <[EMAIL PROTECTED]>
CommitDate: Thu Jun 28 13:26:06 2007 -0500

    phy: Fix phy_id for Vitesse 824x PHY
    
    The phy_id specified for the Vitesse 824x PHY would never match because
    it was expecting bits to be set that would be masked by the phy_id_mask.
    Fix the phy_id so it will match properly, and changed the mdio_bus_match
    to mask both the driver and devices phy_id with the mask so we dont have
    this issue in the future.
    
    Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
---
 drivers/net/phy/mdio_bus.c |    3 ++-
 drivers/net/phy/vitesse.c  |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index fc4aee9..fc2f0e6 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -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
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 792716b..596222b 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -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,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to