From 390ad35551ebd85bf1f85049089d03582b347519 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 8 Sep 2008 18:53:49 +0900
Subject: [PATCH] --- yaml --- r: 112575 b: refs/heads/master c:
 21f6c4de4c25c4bdd88c75bc97a78e7fbeebac4d h: refs/heads/master i:   112573:
 24f410cd801f44624c64349b5b80ca2a5d9cf9bc   112571:
 e8e192bb5e77d821ee6e916e761ae7c0afe33b29   112567:
 446179543e6b6bc4145f1151796cda6d0b121c02   112559:
 007f44c4f1d9467b88b91da1c18a7eb9e4e686dd   112543:
 5b93f16f65634e4903f694a475ca017538e46d67   112511:
 237c049cfe54bb630074de8fb48b86a747e02aa1 v: v3

---
 [refs]              | 2 +-
 trunk/lib/swiotlb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 51bec8d39020..a57046b0d33a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dfda12b8b769e224ca4efbc35ace4524b9c017b
+refs/heads/master: 21f6c4de4c25c4bdd88c75bc97a78e7fbeebac4d
diff --git a/trunk/lib/swiotlb.c b/trunk/lib/swiotlb.c
index 2fb485d0e7eb..bf61c73a3418 100644
--- a/trunk/lib/swiotlb.c
+++ b/trunk/lib/swiotlb.c
@@ -513,7 +513,7 @@ swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
 		free_pages((unsigned long) vaddr, get_order(size));
 	else
 		/* DMA_TO_DEVICE to avoid memcpy in unmap_single */
-		swiotlb_unmap_single (hwdev, dma_handle, size, DMA_TO_DEVICE);
+		unmap_single(hwdev, vaddr, size, DMA_TO_DEVICE);
 }
 
 static void