git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
[pandora-kernel.git]
/
drivers
/
net
/
ni52.c
diff --git
a/drivers/net/ni52.c
b/drivers/net/ni52.c
index
aad3b37
..
b42f5e5
100644
(file)
--- a/
drivers/net/ni52.c
+++ b/
drivers/net/ni52.c
@@
-284,7
+284,7
@@
static int ni52_open(struct net_device *dev)
startrecv586(dev);
ni_enaint();
startrecv586(dev);
ni_enaint();
- ret = request_irq(dev->irq,
&
ni52_interrupt, 0, dev->name, dev);
+ ret = request_irq(dev->irq, ni52_interrupt, 0, dev->name, dev);
if (ret) {
ni_reset586();
return ret;
if (ret) {
ni_reset586();
return ret;
@@
-477,8
+477,8
@@
static int __init ni52_probe1(struct net_device *dev, int ioaddr)
for (i = 0; i < ETH_ALEN; i++)
dev->dev_addr[i] = inb(dev->base_addr+i);
for (i = 0; i < ETH_ALEN; i++)
dev->dev_addr[i] = inb(dev->base_addr+i);
- if (dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1
-
||
dev->dev_addr[2] != NI52_ADDR2) {
+ if (dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1
||
+ dev->dev_addr[2] != NI52_ADDR2) {
retval = -ENODEV;
goto out;
}
retval = -ENODEV;
goto out;
}