Merge branch 'v2.6.25-rc3-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / dma.c

diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c
index ec024b5d5e5e2afaa49c1a7da31a36785f16d52c..73685e7dc7e4c9e6acea24c454e737686768b7e3 100644 (file)
--- a/drivers/ieee1394/dma.c
+++ b/drivers/ieee1394/dma.c
@@ -231,28 +231,20 @@ void dma_region_sync_for_device(struct dma_region *dma, unsigned long offset,
 
 #ifdef CONFIG_MMU
 
-/* fault() handler for mmap access */
-
 static int dma_region_pagefault(struct vm_area_struct *vma,
-                                       struct vm_fault *vmf)
+                               struct vm_fault *vmf)
 {
-       unsigned long kernel_virt_addr;
-
        struct dma_region *dma = (struct dma_region *)vma->vm_private_data;
 
        if (!dma->kvirt)
-               goto error;
+               return VM_FAULT_SIGBUS;
 
        if (vmf->pgoff >= dma->n_pages)
-               goto error;
+               return VM_FAULT_SIGBUS;
 
-       kernel_virt_addr = (unsigned long)dma->kvirt + (vmf->pgoff << PAGE_SHIFT);
-       vmf->page = vmalloc_to_page((void *)kernel_virt_addr);
+       vmf->page = vmalloc_to_page(dma->kvirt + (vmf->pgoff << PAGE_SHIFT));
        get_page(vmf->page);
        return 0;
-
-      error:
-       return VM_FAULT_SIGBUS;
 }
 
 static struct vm_operations_struct dma_region_vm_ops = {