From 18bf96f58be89ca424fcc08b09f872d4b3306311 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 3 Jul 2011 19:46:39 +0100 Subject: [PATCH] --- yaml --- r: 258167 b: refs/heads/master c: 71695dd8b9eacfcda1b548a5b1780d34213ad654 h: refs/heads/master i: 258165: ecec0d4f7a98765fcd230665ed6829cfd2d941bc 258163: 35c9392dd6460b7101787e067802e6eedeebac83 258159: 4a87c5b1f4773364039c51cca84adad701ca3d44 v: v3 --- [refs] | 2 +- trunk/arch/arm/common/dmabounce.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f0b44965f5c0..088162077788 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8021a4a048a85906302bd0236f3d125473be65b1 +refs/heads/master: 71695dd8b9eacfcda1b548a5b1780d34213ad654 diff --git a/trunk/arch/arm/common/dmabounce.c b/trunk/arch/arm/common/dmabounce.c index 8a0588b007e4..3e0fa1548582 100644 --- a/trunk/arch/arm/common/dmabounce.c +++ b/trunk/arch/arm/common/dmabounce.c @@ -334,8 +334,6 @@ dma_addr_t __dma_map_page(struct device *dev, struct page *page, dev_dbg(dev, "%s(page=%p,off=%#lx,size=%zx,dir=%x)\n", __func__, page, offset, size, dir); - BUG_ON(!valid_dma_direction(dir)); - if (PageHighMem(page)) { dev_err(dev, "DMA buffer bouncing of HIGHMEM pages " "is not supported\n");