---

yaml --- r: 278521 b: refs/heads/master c: 86f9f2c h: refs/heads/master i: 278519: 9222277 v: v3
git-mirror · Dec 9, 2011 · 737289f · 737289f
1 parent 05ef1a1
commit 737289f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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) {