diff options
Diffstat (limited to 'drivers/net/irda/vlsi_ir.c')
-rw-r--r-- | drivers/net/irda/vlsi_ir.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index a0849f49bbec..c0192f97ecc8 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
@@ -418,8 +418,9 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr | |||
418 | memset(rd, 0, sizeof(*rd)); | 418 | memset(rd, 0, sizeof(*rd)); |
419 | rd->hw = hwmap + i; | 419 | rd->hw = hwmap + i; |
420 | rd->buf = kmalloc(len, GFP_KERNEL|GFP_DMA); | 420 | rd->buf = kmalloc(len, GFP_KERNEL|GFP_DMA); |
421 | if (rd->buf == NULL || | 421 | if (rd->buf) |
422 | !(busaddr = pci_map_single(pdev, rd->buf, len, dir))) { | 422 | busaddr = pci_map_single(pdev, rd->buf, len, dir); |
423 | if (rd->buf == NULL || pci_dma_mapping_error(pdev, busaddr)) { | ||
423 | if (rd->buf) { | 424 | if (rd->buf) { |
424 | net_err_ratelimited("%s: failed to create PCI-MAP for %p\n", | 425 | net_err_ratelimited("%s: failed to create PCI-MAP for %p\n", |
425 | __func__, rd->buf); | 426 | __func__, rd->buf); |
@@ -430,8 +431,7 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr | |||
430 | rd = r->rd + j; | 431 | rd = r->rd + j; |
431 | busaddr = rd_get_addr(rd); | 432 | busaddr = rd_get_addr(rd); |
432 | rd_set_addr_status(rd, 0, 0); | 433 | rd_set_addr_status(rd, 0, 0); |
433 | if (busaddr) | 434 | pci_unmap_single(pdev, busaddr, len, dir); |
434 | pci_unmap_single(pdev, busaddr, len, dir); | ||
435 | kfree(rd->buf); | 435 | kfree(rd->buf); |
436 | rd->buf = NULL; | 436 | rd->buf = NULL; |
437 | } | 437 | } |