From 5a22f28774e3f86aeb8e8c9a8a2792af184f05d9 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 4 Jul 2011 08:34:33 +0100 Subject: [PATCH] --- yaml --- r: 258174 b: refs/heads/master c: 5c8598fca1a359520623ed5409d23bb9e23d7da3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/common/it8152.c | 3 +-- trunk/arch/arm/mach-ixp4xx/common-pci.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eda6658b7309..46658eb3370e 100644 --- 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 index 80b49e1e0992..14ad62e16dd1 100644 --- 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 index d7db10cfe53d..e2e98bbb6413 100644 --- 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; } /*