diff --git a/[refs] b/[refs] index e97ae5c90f17..8ab8248e0883 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fee5f51a56aa7a67d955993572a2ae05d31a2c6 +refs/heads/master: 99e1baf869cf20791e66e38facd51d14b28551f8 diff --git a/trunk/drivers/net/smc91x.c b/trunk/drivers/net/smc91x.c index 1438fdd20826..c5bc8ae84dd3 100644 --- a/trunk/drivers/net/smc91x.c +++ b/trunk/drivers/net/smc91x.c @@ -1983,6 +1983,10 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr) if (lp->version >= (CHIP_91100 << 4)) smc_phy_detect(dev); + /* then shut everything down to save power */ + smc_shutdown(dev); + smc_phy_powerdown(dev); + /* Set default parameters */ lp->msg_enable = NETIF_MSG_LINK; lp->ctl_rfduplx = 0;