---

yaml --- r: 258174 b: refs/heads/master c: 5c8598f h: refs/heads/master v: v3
git-mirror · Jul 4, 2011 · 5a22f28 · 5a22f28
1 parent 92d15b3
commit 5a22f28
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0703ed2a6b260cd743adf49a8281eb064d728832
+refs/heads/master: 5c8598fca1a359520623ed5409d23bb9e23d7da3
diff --git a/trunk/arch/arm/common/it8152.c b/trunk/arch/arm/common/it8152.c
@@ -247,8 +247,7 @@ static int it8152_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t s
 {
 	dev_dbg(dev, "%s: dma_addr %08x, size %08x\n",
 		__func__, dma_addr, size);
-	return dev->bus == &pci_bus_type &&
-		(dma_addr + size - PHYS_OFFSET) >= SZ_64M;
+	return (dma_addr + size - PHYS_OFFSET) >= SZ_64M;
 }
 
 /*

diff --git a/trunk/arch/arm/mach-ixp4xx/common-pci.c b/trunk/arch/arm/mach-ixp4xx/common-pci.c
@@ -318,7 +318,7 @@ static int abort_handler(unsigned long addr, unsigned int fsr, struct pt_regs *r
 
 static int ixp4xx_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
 {
-	return dev->bus == &pci_bus_type && (dma_addr + size) >= SZ_64M;
+	return (dma_addr + size) >= SZ_64M;
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up @@
     static int ixp4xx_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
     {
-    	return dev->bus == &pci_bus_type && (dma_addr + size) >= SZ_64M;
+    	return (dma_addr + size) >= SZ_64M;
     }
     /*
@@ Expand Down @@