From: zsq <zsq@rock-chips.com>
Date: Sun, 30 Dec 2012 06:35:32 +0000 (+0800)
Subject: remove VM_PFNMAP jump condition
X-Git-Tag: firefly_0821_release~8035
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bf59e00829ac65be709d600ba3a4ea892f348494;p=firefly-linux-kernel-4.4.55.git

remove VM_PFNMAP jump condition
---

diff --git a/drivers/video/rockchip/rga/rga_mmu_info.c b/drivers/video/rockchip/rga/rga_mmu_info.c
index 8a1f5fd67ee2..4ba0cb816541 100755
--- a/drivers/video/rockchip/rga/rga_mmu_info.c
+++ b/drivers/video/rockchip/rga/rga_mmu_info.c
@@ -246,6 +246,7 @@ static int rga_MapUserMemory(struct page **pages,
     uint32_t status;
     uint32_t Address;
     uint32_t temp;
+    
     status = 0;
     Address = 0;
     
@@ -292,7 +293,7 @@ static int rga_MapUserMemory(struct page **pages,
             {                
                 vma = find_vma(current->mm, (Memory + i) << PAGE_SHIFT);
 
-                if (vma && (vma->vm_flags & VM_PFNMAP) )
+                if (vma)//&& (vma->vm_flags & VM_PFNMAP) )
                 {
                     do
                     {
@@ -347,7 +348,7 @@ static int rga_MapUserMemory(struct page **pages,
                 }     
             }
             
-            return 0;
+            return status;
         }
         #endif