diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 02:41:14 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 02:41:14 -0500 |
| commit | cfb13c5db08c90311a5defdde9a0328ee788cca5 (patch) | |
| tree | 842cb60d1d19b99e550fdbc653723e4b13e51ee5 /drivers/net/gianfar.c | |
| parent | 4b6ba8aacbb3185703b797286547d0f8f3859b02 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into devicetree/next
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index f860072e2f68..44be037705ab 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -578,11 +578,10 @@ static int gfar_parse_group(struct device_node *np, | |||
| 578 | irq_of_parse_and_map(np, 1); | 578 | irq_of_parse_and_map(np, 1); |
| 579 | priv->gfargrp[priv->num_grps].interruptError = | 579 | priv->gfargrp[priv->num_grps].interruptError = |
| 580 | irq_of_parse_and_map(np,2); | 580 | irq_of_parse_and_map(np,2); |
| 581 | if (priv->gfargrp[priv->num_grps].interruptTransmit < 0 || | 581 | if (priv->gfargrp[priv->num_grps].interruptTransmit == NO_IRQ || |
| 582 | priv->gfargrp[priv->num_grps].interruptReceive < 0 || | 582 | priv->gfargrp[priv->num_grps].interruptReceive == NO_IRQ || |
| 583 | priv->gfargrp[priv->num_grps].interruptError < 0) { | 583 | priv->gfargrp[priv->num_grps].interruptError == NO_IRQ) |
| 584 | return -EINVAL; | 584 | return -EINVAL; |
| 585 | } | ||
| 586 | } | 585 | } |
| 587 | 586 | ||
| 588 | priv->gfargrp[priv->num_grps].grp_id = priv->num_grps; | 587 | priv->gfargrp[priv->num_grps].grp_id = priv->num_grps; |