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 branch 'topic/usb-audio' into for-linus
[pandora-kernel.git]
/
drivers
/
net
/
e100.c
diff --git
a/drivers/net/e100.c
b/drivers/net/e100.c
index
41b648a
..
3a6735d
100644
(file)
--- a/
drivers/net/e100.c
+++ b/
drivers/net/e100.c
@@
-1899,7
+1899,7
@@
static int e100_rx_indicate(struct nic *nic, struct rx *rx,
nic->ru_running = RU_SUSPENDED;
pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,
sizeof(struct rfd),
- PCI_DMA_
BIDIRECTIONAL
);
+ PCI_DMA_
FROMDEVICE
);
return -ENODATA;
}