git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
net
/
arm
/
am79c961a.c
diff --git
a/drivers/net/arm/am79c961a.c
b/drivers/net/arm/am79c961a.c
index
53e3afc
..
ddd12d4
100644
(file)
--- a/
drivers/net/arm/am79c961a.c
+++ b/
drivers/net/arm/am79c961a.c
@@
-38,7
+38,7
@@
#include "am79c961a.h"
static irqreturn_t
#include "am79c961a.h"
static irqreturn_t
-am79c961_interrupt (int irq, void *dev_id
, struct pt_regs *regs
);
+am79c961_interrupt (int irq, void *dev_id);
static unsigned int net_debug = NET_DEBUG;
static unsigned int net_debug = NET_DEBUG;
@@
-596,7
+596,7
@@
am79c961_tx(struct net_device *dev, struct dev_priv *priv)
}
static irqreturn_t
}
static irqreturn_t
-am79c961_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+am79c961_interrupt(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
struct dev_priv *priv = netdev_priv(dev);
{
struct net_device *dev = (struct net_device *)dev_id;
struct dev_priv *priv = netdev_priv(dev);
@@
-696,7
+696,9
@@
static int __init am79c961_probe(struct platform_device *pdev)
dev->base_addr = res->start;
dev->irq = platform_get_irq(pdev, 0);
dev->base_addr = res->start;
dev->irq = platform_get_irq(pdev, 0);
- ret = -ENODEV;
+ ret = -ENODEV;
+ if (dev->irq < 0)
+ goto nodev;
if (!request_region(dev->base_addr, 0x18, dev->name))
goto nodev;
if (!request_region(dev->base_addr, 0x18, dev->name))
goto nodev;