diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-01-11 00:18:13 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-11 00:18:13 -0800 |
commit | 2a7e637de51ded7b0b56b927f45915eadb6734bb (patch) | |
tree | 2bc3ae50602f23ddbfc9d2a879622a38ec39d1b2 /drivers/net/sfc/tenxpress.c | |
parent | 4dbc242ed3c94ff1cc10640d2119279ba0be943e (diff) | |
download | op-kernel-dev-2a7e637de51ded7b0b56b927f45915eadb6734bb.zip op-kernel-dev-2a7e637de51ded7b0b56b927f45915eadb6734bb.tar.gz |
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 <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/tenxpress.c')
-rw-r--r-- | drivers/net/sfc/tenxpress.c | 5 |
1 files changed, 3 insertions, 2 deletions
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, |