X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsmc91x.c;h=c5bc8ae84dd3989793e0bef7589b54dada28607a;hb=b2795f596932286ef12dc08857960d654f577405;hp=cfb9d3cdb04a593713df0fabcf2f8359bdbc1b4d;hpb=d498a2c76568d3bb5add06390f077b1a423b0794;p=powerpc.git

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index cfb9d3cdb0..c5bc8ae84d 100644
--- a/drivers/net/smc91x.c
+++ b/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;
@@ -1998,7 +2002,7 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr)
       	if (retval)
       		goto err_out;
 
-	set_irq_type(dev->irq, IRQT_RISING);
+	set_irq_type(dev->irq, SMC_IRQ_TRIGGER_TYPE);
 
 #ifdef SMC_USE_PXA_DMA
 	{