From: Ben Hutchings Date: Sun, 11 Jan 2009 08:18:13 +0000 (-0800) Subject: sfc: SFT9001: Fix condition for LNPGA power-off X-Git-Tag: v2.6.29-rc2~105^2~3 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=2a7e637de51ded7b0b56b927f45915eadb6734bb;hp=4dbc242ed3c94ff1cc10640d2119279ba0be943e;p=safe%2Fjmp%2Flinux-2.6 sfc: SFT9001: Fix condition for LNPGA power-off Only the SFX7101 requires software power control. This was incorrectly being applied to the SFT9001 rev A as well. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller --- diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c index b976876..9ecb77d 100644 --- a/drivers/net/sfc/tenxpress.c +++ b/drivers/net/sfc/tenxpress.c @@ -636,10 +636,11 @@ static void tenxpress_phy_fini(struct efx_nic *efx) { int reg; - if (efx->phy_type == PHY_TYPE_SFT9001B) { + if (efx->phy_type == PHY_TYPE_SFT9001B) device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_short_reach); - } else { + + if (efx->phy_type == PHY_TYPE_SFX7101) { /* Power down the LNPGA */ reg = (1 << PMA_PMD_LNPGA_POWERDOWN_LBN); mdio_clause45_write(efx, efx->mii.phy_id, MDIO_MMD_PMAPMD,