Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92891ed6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull dma-mapping fix from Marek Szyprowski:
 "A small fix for dma-mapping subsystem for ARM"

* 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  arm: dma-mapping: Fix mapping size value
parents fdd324aa 59f0f119
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1963,8 +1963,8 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size)
	mapping->nr_bitmaps = 1;
	mapping->extensions = extensions;
	mapping->base = base;
	mapping->size = bitmap_size << PAGE_SHIFT;
	mapping->bits = BITS_PER_BYTE * bitmap_size;
	mapping->size = mapping->bits << PAGE_SHIFT;

	spin_lock_init(&mapping->lock);