From 157ff691ea89665670657e11ee08fe7da88ab600 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 28 Jul 2008 02:22:14 +1000 Subject: [PATCH] --- yaml --- r: 106893 b: refs/heads/master c: 0764bf63da5466474eebf7d21994cf6b106265a3 h: refs/heads/master i: 106891: 6371c8cda3aedb2ca376e56fcf5b6119aed4c0a4 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/vio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bbc31b46d66a..b9c7a990216f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c713e7cbfa529f87e18bb2eacb2ccdd4ee0ef7d3 +refs/heads/master: 0764bf63da5466474eebf7d21994cf6b106265a3 diff --git a/trunk/arch/powerpc/kernel/vio.c b/trunk/arch/powerpc/kernel/vio.c index 6952384cf89c..22a3c33fd751 100644 --- a/trunk/arch/powerpc/kernel/vio.c +++ b/trunk/arch/powerpc/kernel/vio.c @@ -530,7 +530,7 @@ static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr, } ret = dma_iommu_ops.map_single(dev, vaddr, size, direction, attrs); - if (unlikely(dma_mapping_error(ret))) { + if (unlikely(dma_mapping_error(dev, ret))) { vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); atomic_inc(&viodev->cmo.allocs_failed); }