---

yaml --- r: 335598 b: refs/heads/master c: 103cdd1 h: refs/heads/master v: v3
git-mirror · Nov 9, 2012 · 9aff846 · 9aff846
1 parent 5e455c3
commit 9aff846
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9532021da6da48351ce48a079c673df8e3930b4a
+refs/heads/master: 103cdd1d59e1ab6abccb049093239cc8e6295816
diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c
@@ -1353,8 +1353,11 @@ static int gfar_restore(struct device *dev)
 	struct gfar_private *priv = dev_get_drvdata(dev);
 	struct net_device *ndev = priv->ndev;
 
-	if (!netif_running(ndev))
+	if (!netif_running(ndev)) {
+		netif_device_attach(ndev);
+
 		return 0;
+	}
 
 	gfar_init_bds(ndev);
 	init_registers(ndev);