diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-21 16:48:01 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-21 16:48:01 -0400 |
| commit | 0c9de3c52d2baed6bc2ee44885adb418152c71c4 (patch) | |
| tree | e19ab2c41ae47250fd614418022b32aa783aa563 /arch/arm/mm/dma-mapping.c | |
| parent | 6bfc82ff589a00e5fbc12b958c649d703d273c86 (diff) | |
| parent | 3c7c5dab44d6c8861bc86dab924353d8d40344f8 (diff) | |
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer
Conflicts:
arch/arm/mach-omap2/timer.c
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 051204fc4617..e59c4ab71bcb 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
| @@ -489,7 +489,7 @@ static bool __in_atomic_pool(void *start, size_t size) | |||
| 489 | void *pool_start = pool->vaddr; | 489 | void *pool_start = pool->vaddr; |
| 490 | void *pool_end = pool->vaddr + pool->size; | 490 | void *pool_end = pool->vaddr + pool->size; |
| 491 | 491 | ||
| 492 | if (start < pool_start || start > pool_end) | 492 | if (start < pool_start || start >= pool_end) |
| 493 | return false; | 493 | return false; |
| 494 | 494 | ||
| 495 | if (end <= pool_end) | 495 | if (end <= pool_end) |