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
ath9k: Fix IRQ nobody cared issue with ath9k
[pandora-kernel.git]
/
drivers
/
net
/
e100.c
diff --git
a/drivers/net/e100.c
b/drivers/net/e100.c
index
19d32a2
..
5cf78d6
100644
(file)
--- a/
drivers/net/e100.c
+++ b/
drivers/net/e100.c
@@
-1838,7
+1838,7
@@
static int e100_rx_indicate(struct nic *nic, struct rx *rx,
if ((le16_to_cpu(rfd->command) & cb_el) &&
(RU_RUNNING == nic->ru_running))
if ((le16_to_cpu(rfd->command) & cb_el) &&
(RU_RUNNING == nic->ru_running))
- if (
readb
(&nic->csr->scb.status) & rus_no_res)
+ if (
ioread8
(&nic->csr->scb.status) & rus_no_res)
nic->ru_running = RU_SUSPENDED;
return -ENODATA;
}
nic->ru_running = RU_SUSPENDED;
return -ENODATA;
}
@@
-1861,7
+1861,7
@@
static int e100_rx_indicate(struct nic *nic, struct rx *rx,
if ((le16_to_cpu(rfd->command) & cb_el) &&
(RU_RUNNING == nic->ru_running)) {
if ((le16_to_cpu(rfd->command) & cb_el) &&
(RU_RUNNING == nic->ru_running)) {
- if (
readb
(&nic->csr->scb.status) & rus_no_res)
+ if (
ioread8
(&nic->csr->scb.status) & rus_no_res)
nic->ru_running = RU_SUSPENDED;
}
nic->ru_running = RU_SUSPENDED;
}
@@
-2738,9
+2738,7
@@
static int __devinit e100_probe(struct pci_dev *pdev,
nic->flags |= wol_magic;
/* ack any pending wake events, disable PME */
nic->flags |= wol_magic;
/* ack any pending wake events, disable PME */
- err = pci_enable_wake(pdev, 0, 0);
- if (err)
- DPRINTK(PROBE, ERR, "Error clearing wake event\n");
+ pci_pme_active(pdev, false);
strcpy(netdev->name, "eth%d");
if((err = register_netdev(netdev))) {
strcpy(netdev->name, "eth%d");
if((err = register_netdev(netdev))) {