OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2269201
)
qlge: bugfix: Add missing pci_mapping_err checking.
author
Ron Mercer
<ron.mercer@qlogic.com>
Mon, 5 Jan 2009 01:06:46 +0000
(17:06 -0800)
committer
David S. Miller
<davem@davemloft.net>
Mon, 5 Jan 2009 01:06:46 +0000
(17:06 -0800)
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/qlge/qlge_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/qlge/qlge_main.c
b/drivers/net/qlge/qlge_main.c
index
718a7bd
..
c6ab6a4
100644
(file)
--- a/
drivers/net/qlge/qlge_main.c
+++ b/
drivers/net/qlge/qlge_main.c
@@
-963,6
+963,11
@@
static void ql_update_sbq(struct ql_adapter *qdev, struct rx_ring *rx_ring)
sbq_desc->p.skb->data,
rx_ring->sbq_buf_size /
2, PCI_DMA_FROMDEVICE);
+ if (pci_dma_mapping_error(qdev->pdev, map)) {
+ QPRINTK(qdev, IFUP, ERR, "PCI mapping failed.\n");
+ rx_ring->sbq_clean_idx = clean_idx;
+ return;
+ }
pci_unmap_addr_set(sbq_desc, mapaddr, map);
pci_unmap_len_set(sbq_desc, maplen,
rx_ring->sbq_buf_size / 2);