From e1db460f3f5c25139745387c22f601db8e6be4e7 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Fri, 22 Mar 2013 03:17:47 +0000
Subject: [PATCH] --- yaml --- r: 368603 b: refs/heads/master c:
 43d6869037d6fa8f92a7a7e6df3b48147c8a3ef9 h: refs/heads/master i:   368601:
 b8917ef0a8274a4dd89a66bdc6310e6ba9b64755   368599:
 b1abacbb0ab67c4ed08d79b909ab4b663dcd7455 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/ethernet/s6gmac.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3bb334fc28b3..d59c0961274c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6a8c36dd6f6f06f046e5c61d3fb39b777c3bdc6
+refs/heads/master: 43d6869037d6fa8f92a7a7e6df3b48147c8a3ef9
diff --git a/trunk/drivers/net/ethernet/s6gmac.c b/trunk/drivers/net/ethernet/s6gmac.c
index cd5f4e21cede..b6739afeaca1 100644
--- a/trunk/drivers/net/ethernet/s6gmac.c
+++ b/trunk/drivers/net/ethernet/s6gmac.c
@@ -998,6 +998,7 @@ static int s6gmac_probe(struct platform_device *pdev)
 	mb = mdiobus_alloc();
 	if (!mb) {
 		printk(KERN_ERR DRV_PRMT "error allocating mii bus\n");
+		res = -ENOMEM;
 		goto errmii;
 	}
 	mb->name = "s6gmac_mii";