From: 陈恒明 <chm@rock-chips.com>
Date: Tue, 10 Apr 2012 02:13:45 +0000 (+0800)
Subject: rk30: vpu_service: move reset before set the codec register
X-Git-Tag: firefly_0821_release~9443
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=094d9a9146c39dc2ec68c21362da85113342f605;p=firefly-linux-kernel-4.4.55.git

rk30: vpu_service: move reset before set the codec register
---

diff --git a/arch/arm/plat-rk/vpu_service.c b/arch/arm/plat-rk/vpu_service.c
index e9aa4937ea3d..74d4cbb82b7f 100644
--- a/arch/arm/plat-rk/vpu_service.c
+++ b/arch/arm/plat-rk/vpu_service.c
@@ -448,11 +448,10 @@ void reg_copy_to_hw(vpu_reg *reg)
 	switch (reg->type) {
 	case VPU_ENC : {
 		u32 *dst = (u32 *)enc_dev.hwregs;
-		service.reg_codec = reg;
-
 #if defined(CONFIG_ARCH_RK30)
 		vpu_reset();
 #endif
+		service.reg_codec = reg;
 
 		dst[VPU_REG_EN_ENC] = src[VPU_REG_EN_ENC] & 0x6;