Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765416AbXF1ScV (ORCPT ); Thu, 28 Jun 2007 14:32:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764692AbXF1ScL (ORCPT ); Thu, 28 Jun 2007 14:32:11 -0400 Received: from gate.crashing.org ([63.228.1.57]:36210 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764281AbXF1ScJ (ORCPT ); Thu, 28 Jun 2007 14:32:09 -0400 Date: Thu, 28 Jun 2007 13:31:56 -0500 (CDT) From: Kumar Gala X-X-Sender: galak@blarg.am.freescale.net To: Linus Torvalds cc: netdev@vger.kernel.org, Andy Fleming , Jeff Garzik , linux-kernel@vger.kernel.org Subject: Please pull from 'from_linus' branch Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2186 Lines: 59 Please pull from 'for_linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for_linus to receive the following updates: drivers/net/phy/mdio_bus.c | 3 ++- drivers/net/phy/vitesse.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) Kumar Gala (1): phy: Fix phy_id for Vitesse 824x PHY commit 5f708dd91d15876e26d7a57f97a255cedffca463 Author: Kumar Gala Date: 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 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 linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/