diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/ni52.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/ni52.c')
| -rw-r--r-- | drivers/net/ni52.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c index aad3b370c562..b42f5e522f90 100644 --- a/drivers/net/ni52.c +++ b/drivers/net/ni52.c | |||
| @@ -284,7 +284,7 @@ static int ni52_open(struct net_device *dev) | |||
| 284 | startrecv586(dev); | 284 | startrecv586(dev); |
| 285 | ni_enaint(); | 285 | ni_enaint(); |
| 286 | 286 | ||
| 287 | ret = request_irq(dev->irq, &ni52_interrupt, 0, dev->name, dev); | 287 | ret = request_irq(dev->irq, ni52_interrupt, 0, dev->name, dev); |
| 288 | if (ret) { | 288 | if (ret) { |
| 289 | ni_reset586(); | 289 | ni_reset586(); |
| 290 | return ret; | 290 | return ret; |
| @@ -477,8 +477,8 @@ static int __init ni52_probe1(struct net_device *dev, int ioaddr) | |||
| 477 | for (i = 0; i < ETH_ALEN; i++) | 477 | for (i = 0; i < ETH_ALEN; i++) |
| 478 | dev->dev_addr[i] = inb(dev->base_addr+i); | 478 | dev->dev_addr[i] = inb(dev->base_addr+i); |
| 479 | 479 | ||
| 480 | if (dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1 | 480 | if (dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1 || |
| 481 | || dev->dev_addr[2] != NI52_ADDR2) { | 481 | dev->dev_addr[2] != NI52_ADDR2) { |
| 482 | retval = -ENODEV; | 482 | retval = -ENODEV; |
| 483 | goto out; | 483 | goto out; |
| 484 | } | 484 | } |