hwmon: (w83627hf) Drop reset module parameter

[linux-2.6-omap-h63xx.git] / kernel / dma-coherent.c

diff --git a/kernel/dma-coherent.c b/kernel/dma-coherent.c
index 7517115a8cce604cd9535d327d1ab7e12dce2f7a..91e96950cd521b442dd3388e976489e83df8f101 100644 (file)
--- a/kernel/dma-coherent.c
+++ b/kernel/dma-coherent.c
@@ -77,15 +77,14 @@ void *dma_mark_declared_memory_occupied(struct device *dev,
 {
        struct dma_coherent_mem *mem = dev->dma_mem;
        int pos, err;
-       int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1);
 
-       pages >>= PAGE_SHIFT;
+       size += device_addr & ~PAGE_MASK;
 
        if (!mem)
                return ERR_PTR(-EINVAL);
 
        pos = (device_addr - mem->device_base) >> PAGE_SHIFT;
-       err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages));
+       err = bitmap_allocate_region(mem->bitmap, pos, get_order(size));
        if (err != 0)
                return ERR_PTR(err);
        return mem->virt_base + (pos << PAGE_SHIFT);