From 44cb4a3496747563d98ab359e186eb3374e2c689 Mon Sep 17 00:00:00 2001 From: Xiao Jiang Date: Thu, 29 Sep 2011 02:15:56 +0000 Subject: [PATCH] --- yaml --- r: 266203 b: refs/heads/master c: c7c83d1c95b84cf0e71e947613a5d409cf0ebca1 h: refs/heads/master i: 266201: 242fd5f13245b5b55220b17861e7cd81e7b45f11 266199: 092ae6100e989174baa14ccdb2072f72297fc1f3 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fec.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3851ef08ba39..8688f665d142 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e1143742789463c00ed5e7f9bf471f2b707b493 +refs/heads/master: c7c83d1c95b84cf0e71e947613a5d409cf0ebca1 diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c index cce78ceb63ed..1794ea446a9e 100644 --- a/trunk/drivers/net/ethernet/freescale/fec.c +++ b/trunk/drivers/net/ethernet/freescale/fec.c @@ -177,6 +177,8 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); #define PKT_MINBUF_SIZE 64 #define PKT_MAXBLR_SIZE 1520 +/* This device has up to three irqs on some platforms */ +#define FEC_IRQ_NUM 3 /* * The 5270/5271/5280/5282/532x RX control register also contains maximum frame @@ -1540,8 +1542,7 @@ fec_probe(struct platform_device *pdev) fec_reset_phy(pdev); - /* This device has up to three irqs on some platforms */ - for (i = 0; i < 3; i++) { + for (i = 0; i < FEC_IRQ_NUM; i++) { irq = platform_get_irq(pdev, i); if (i && irq < 0) break; @@ -1586,7 +1587,7 @@ fec_probe(struct platform_device *pdev) clk_disable(fep->clk); clk_put(fep->clk); failed_clk: - for (i = 0; i < 3; i++) { + for (i = 0; i < FEC_IRQ_NUM; i++) { irq = platform_get_irq(pdev, i); if (irq > 0) free_irq(irq, ndev);