Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Browse source 
Git pull DMA-mapping fix from Marek Szyprowski:
 "Another minor fixup for ARM dma-mapping redesign and extensions merged
  in this merge window"

* 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: fix buffer chunk allocation order
This commit is contained in:
Linus Torvalds 2012-06-25 10:38:19 -07:00
commit 5c0a981fb1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mm/dma-mapping.c
View file

@ -1067,7 +1067,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, gfp_t
return NULL; return NULL;
while (count) { while (count) {
int j, order = __ffs(count); int j, order = __fls(count);
pages[i] = alloc_pages(gfp | __GFP_NOWARN, order); pages[i] = alloc_pages(gfp | __GFP_NOWARN, order);
while (!pages[i] && order) while (!pages[i] && order)