]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sfc: SFT9001: Fix condition for LNPGA power-off
authorBen Hutchings <bhutchings@solarflare.com>
Sun, 11 Jan 2009 08:18:13 +0000 (00:18 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 11 Jan 2009 08:18:13 +0000 (00:18 -0800)
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>
drivers/net/sfc/tenxpress.c

index b9768760fae7f8de80fa4109a4514d16e3c14ff7..9ecb77da954527a9dff367f4aa0b4674e7f94d17 100644 (file)
@@ -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,