From d8e8b52e1bb612d638bd2350710b329bf6fdfae6 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 5 Jun 2012 20:31:29 +0000
Subject: [PATCH] --- yaml --- r: 313903 b: refs/heads/master c:
 c3001b773bb63afd403bae37febf3f09826912cb h: refs/heads/master i:   313901:
 fe3c303c432a211854f9a281b80b8b462c5bbd87   313899:
 ce43ea3ed78158f0849138536e79f4d2d98a54af   313895:
 9955b2852f2a3d0592edd891d08e74db89585659   313887:
 7b0a06e564b49960f801e55d4de070254641d67c v: v3

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

diff --git a/[refs] b/[refs]
index 1838cec32a73..027b615f1e3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69927fccd96b15bd228bb82d356a7a2a0cfaeefb
+refs/heads/master: c3001b773bb63afd403bae37febf3f09826912cb
diff --git a/trunk/drivers/net/ethernet/micrel/ks8851_mll.c b/trunk/drivers/net/ethernet/micrel/ks8851_mll.c
index 70bd329882c6..875dd5e264eb 100644
--- a/trunk/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/trunk/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -1606,7 +1606,7 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
 	if (!pdata) {
 		netdev_err(netdev, "No platform data\n");
 		err = -ENODEV;
-		goto err_register;
+		goto err_pdata;
 	}
 	memcpy(ks->mac_addr, pdata->mac_addr, 6);
 	if (!is_valid_ether_addr(ks->mac_addr)) {
@@ -1626,6 +1626,8 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
 		    (id >> 8) & 0xff, (id >> 4) & 0xf, (id >> 1) & 0x7);
 	return 0;
 
+err_pdata:
+	unregister_netdev(netdev);
 err_register:
 err_get_irq:
 	iounmap(ks->hw_addr_cmd);