Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266203
b: refs/heads/master
c: c7c83d1
h: refs/heads/master
i:
  266201: 242fd5f
  266199: 092ae61
v: v3
  • Loading branch information
Xiao Jiang authored and David S. Miller committed Sep 29, 2011
1 parent 053788f commit 44cb4a3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2e1143742789463c00ed5e7f9bf471f2b707b493
refs/heads/master: c7c83d1c95b84cf0e71e947613a5d409cf0ebca1
7 changes: 4 additions & 3 deletions trunk/drivers/net/ethernet/freescale/fec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 44cb4a3

Please sign in to comment.