From 2362f6c74f2aa92f0407218f79b33c0257d130e9 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Sun, 10 Jan 2010 13:40:10 -0800 Subject: [PATCH] --- yaml --- r: 179123 b: refs/heads/master c: fa15e99b6bb44aa86b241a43ca8c509e91f80153 h: refs/heads/master i: 179121: 553d81c778cace7f46205826183b43bc5d085761 179119: b4df14475db13cf3bb43b616d35ebdaf0cd6f5c1 v: v3 --- [refs] | 2 +- trunk/drivers/net/vxge/vxge-main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9456cf9298f0..2eded1971057 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31b683b6444c4d207126b07f433e0e66da142264 +refs/heads/master: fa15e99b6bb44aa86b241a43ca8c509e91f80153 diff --git a/trunk/drivers/net/vxge/vxge-main.c b/trunk/drivers/net/vxge/vxge-main.c index 0fdfd58a35a1..b9685e82f7b6 100644 --- a/trunk/drivers/net/vxge/vxge-main.c +++ b/trunk/drivers/net/vxge/vxge-main.c @@ -310,7 +310,7 @@ static int vxge_rx_map(void *dtrh, struct vxge_ring *ring) dma_addr = pci_map_single(ring->pdev, rx_priv->skb_data, rx_priv->data_size, PCI_DMA_FROMDEVICE); - if (dma_addr == 0) { + if (unlikely(pci_dma_mapping_error(ring->pdev, dma_addr))) { ring->stats.pci_map_fail++; return -EIO; }