1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 4b69d061d90f..710715fcb23d 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -1710,8 +1710,10 @@ static void gfar_configure_serdes(struct net_device *dev)
          * everything for us?  Resetting it takes the link down and requires
          * several seconds for it to come back.
          */
-        if (phy_read(tbiphy, MII_BMSR) & BMSR_LSTATUS)
+        if (phy_read(tbiphy, MII_BMSR) & BMSR_LSTATUS) {
+                put_device(&tbiphy->dev);
                 return;
+        }
 
         /* Single clk mode, mii mode off(for serdes communication) */
         phy_write(tbiphy, MII_TBICON, TBICON_CLK_SELECT);
@@ -1723,6 +1725,8 @@ static void gfar_configure_serdes(struct net_device *dev)
         phy_write(tbiphy, MII_BMCR,
                   BMCR_ANENABLE | BMCR_ANRESTART | BMCR_FULLDPLX |
                   BMCR_SPEED1000);
+
+        put_device(&tbiphy->dev);
 }
 
 static int __gfar_is_rx_idle(struct gfar_private *priv)
@@ -1970,8 +1974,7 @@ static int register_grp_irqs(struct gfar_priv_grp *grp)
                 /* Install our interrupt handlers for Error,
                  * Transmit, and Receive
                  */
-                err = request_irq(gfar_irq(grp, ER)->irq, gfar_error,
-                                  IRQF_NO_SUSPEND,
+                err = request_irq(gfar_irq(grp, ER)->irq, gfar_error, 0,
                                   gfar_irq(grp, ER)->name, grp);
                 if (err < 0) {
                         netif_err(priv, intr, dev, "Can't get IRQ %d\n",
@@ -1979,6 +1982,8 @@ static int register_grp_irqs(struct gfar_priv_grp *grp)
 
                         goto err_irq_fail;
                 }
+                enable_irq_wake(gfar_irq(grp, ER)->irq);
+
                 err = request_irq(gfar_irq(grp, TX)->irq, gfar_transmit, 0,
                                   gfar_irq(grp, TX)->name, grp);
                 if (err < 0) {
@@ -1994,14 +1999,14 @@ static int register_grp_irqs(struct gfar_priv_grp *grp)
                         goto rx_irq_fail;
                 }
         } else {
-                err = request_irq(gfar_irq(grp, TX)->irq, gfar_interrupt,
-                                  IRQF_NO_SUSPEND,
+                err = request_irq(gfar_irq(grp, TX)->irq, gfar_interrupt, 0,
                                   gfar_irq(grp, TX)->name, grp);
                 if (err < 0) {
                         netif_err(priv, intr, dev, "Can't get IRQ %d\n",
                                   gfar_irq(grp, TX)->irq);
                         goto err_irq_fail;
                 }
+                enable_irq_wake(gfar_irq(grp, TX)->irq);
         }
 
         return 0;