From 737289f99715b8bcd8de198aba61778838b1a76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= <LW@KARO-electronics.de>
Date: Wed, 7 Dec 2011 21:59:28 +0000
Subject: [PATCH] --- yaml --- r: 278521 b: refs/heads/master c:
 86f9f2c81c44223b1be129d0b15cf6edac2a5278 h: refs/heads/master i:   278519:
 9222277e15276312881b956ac4bb10137ba4fd4b v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ethernet/freescale/fec.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index abd24f91e640..89b4e6878b26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ea0722fb8cdeacc774733c259d33bf45529e91b
+refs/heads/master: 86f9f2c81c44223b1be129d0b15cf6edac2a5278
diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c
index 7ef408fd322a..e2b5ce6efa20 100644
--- a/trunk/drivers/net/ethernet/freescale/fec.c
+++ b/trunk/drivers/net/ethernet/freescale/fec.c
@@ -1575,8 +1575,12 @@ fec_probe(struct platform_device *pdev)
 
 	for (i = 0; i < FEC_IRQ_NUM; i++) {
 		irq = platform_get_irq(pdev, i);
-		if (i && irq < 0)
-			break;
+		if (irq < 0) {
+			if (i)
+				break;
+			ret = irq;
+			goto failed_irq;
+		}
 		ret = request_irq(irq, fec_enet_interrupt, IRQF_DISABLED, pdev->name, ndev);
 		if (ret) {
 			while (--i >= 0) {