summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Mercer <ron.mercer@qlogic.com>2009-01-04 17:06:46 -0800
committerDavid S. Miller <davem@davemloft.net>2009-01-04 17:06:46 -0800
commitc907a35acf0e964dfd0753519b3dc7689727e175 (patch)
tree196424b7e8f6d3999773db5cdac0e9285e033d29
parent22692018b93f0782cda5a843cecfffda1854eb8d (diff)
downloadlinux-3.10-c907a35acf0e964dfd0753519b3dc7689727e175.tar.gz
linux-3.10-c907a35acf0e964dfd0753519b3dc7689727e175.tar.bz2
linux-3.10-c907a35acf0e964dfd0753519b3dc7689727e175.zip
qlge: bugfix: Add missing pci_mapping_err checking.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/qlge/qlge_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 718a7bd0cd1..c6ab6a493e7 100644
--- 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);