From d8e6e29b194d793684c2ebda73c6e798cce6450f Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 5 Dec 2007 11:14:27 +1100
Subject: [PATCH] --- yaml --- r: 74727 b: refs/heads/master c:
 968530643a0685caced9dfd6f72f20d5e7bc8fbb h: refs/heads/master i:   74725:
 695c4106733825018b1ec5c4ed207abda8fa47ea   74723:
 60b97b89feea8fc0d71175a1e2adb6b897ab45cc   74719:
 865c0fd6972cc1062fce42b444d5f60bb1aacc15 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ibm_newemac/zmii.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e3000086abde..caad8605d596 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8df4538e21f7313a29fa6c5af78c08a135d44738
+refs/heads/master: 968530643a0685caced9dfd6f72f20d5e7bc8fbb
diff --git a/trunk/drivers/net/ibm_newemac/zmii.c b/trunk/drivers/net/ibm_newemac/zmii.c
index 2219ec2740e0..0f8cfbc0c618 100644
--- a/trunk/drivers/net/ibm_newemac/zmii.c
+++ b/trunk/drivers/net/ibm_newemac/zmii.c
@@ -83,12 +83,14 @@ int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode)
 
 	ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode);
 
-	if (!zmii_valid_mode(*mode))
+	if (!zmii_valid_mode(*mode)) {
 		/* Probably an EMAC connected to RGMII,
 		 * but it still may need ZMII for MDIO so
 		 * we don't fail here.
 		 */
+		dev->users++;
 		return 0;
+	}
 
 	mutex_lock(&dev->lock);