rk3288: deactivate iommu before power off, get rid of warnning from iommu module
authorljf <ljf@rock-chips.com>
Thu, 15 May 2014 07:24:45 +0000 (15:24 +0800)
committerljf <ljf@rock-chips.com>
Thu, 15 May 2014 07:24:45 +0000 (15:24 +0800)
arch/arm/mach-rockchip/vcodec_service.c

index 4b7ee70ccdc62c9c9a4c9334191d014d299422b7..14b1a5b150550bee4facec9a0f1be0f66156d1ef 100755 (executable)
@@ -551,6 +551,12 @@ static void vpu_service_power_off(struct vpu_service_info *pservice)
         pr_alert("alert: delay 50 ms for running task\n");\r
         vpu_service_dump(pservice);\r
     }\r
+    \r
+#if defined(CONFIG_VCODEC_MMU)\r
+    if (pservice->mmu_dev) {\r
+        iovmm_deactivate(pservice->dev);\r
+    }\r
+#endif \r
 \r
     printk("%s: power off...", dev_name(pservice->dev));\r
     udelay(10);\r
@@ -565,12 +571,6 @@ static void vpu_service_power_off(struct vpu_service_info *pservice)
 #endif\r
     wake_unlock(&pservice->wake_lock);\r
     printk("done\n");\r
-    \r
-#if defined(CONFIG_VCODEC_MMU)\r
-    if (pservice->mmu_dev) {\r
-        iovmm_deactivate(pservice->dev);\r
-    }\r
-#endif    \r
 }\r
 \r
 static inline void vpu_queue_power_off_work(struct vpu_service_info *pservice)\r