diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 14:50:51 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 14:50:51 +0000 |
| commit | b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7 (patch) | |
| tree | 030ef62361042d1a034087ad9a726db3b57bba72 /drivers/net/gianfar.c | |
| parent | bb8047d3540affd6b8c2adac3fe792e07143be0f (diff) | |
| parent | 2e6e33bab6e1996a5dec9108fb467b52b841e7a8 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 0e8e3fcde9f..771e25d8c41 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -193,8 +193,12 @@ static int gfar_probe(struct platform_device *pdev) priv->interruptTransmit = platform_get_irq_byname(pdev, "tx"); priv->interruptReceive = platform_get_irq_byname(pdev, "rx"); priv->interruptError = platform_get_irq_byname(pdev, "error"); + if (priv->interruptTransmit < 0 || priv->interruptReceive < 0 || priv->interruptError < 0) + goto regs_fail; } else { priv->interruptTransmit = platform_get_irq(pdev, 0); + if (priv->interruptTransmit < 0) + goto regs_fail; } /* get a pointer to the register memory */ |