From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 19 Jul 2011 10:10:54 +0000 (+0800)
Subject: Revert "rk29: vpu_service: fix bug when __cancel_delayed_work and delay work run... 
X-Git-Tag: firefly_0821_release~10110^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=29492dc9e1985e5fa54ee9474150347ca2e665b6;p=firefly-linux-kernel-4.4.55.git

Revert "rk29: vpu_service: fix bug when __cancel_delayed_work and delay work run at the same time"

This reverts commit c41dd263406cad12ec15d39986a530be1d23ad11.
---

diff --git a/arch/arm/mach-rk29/vpu_service.c b/arch/arm/mach-rk29/vpu_service.c
index 35c64a99815d..b0d08b29967d 100644
--- a/arch/arm/mach-rk29/vpu_service.c
+++ b/arch/arm/mach-rk29/vpu_service.c
@@ -391,11 +391,7 @@ static void try_set_reg(void)
        		    ((VPU_PP  == reg->type) && (NULL == service.reg_pproc)) ||
        		    ((VPU_ENC == reg->type) && (NULL == service.reg_codec))) {
 			reg_from_wait_to_run(reg);
-			if (in_interrupt()) {
-				__cancel_delayed_work(&vpu_service_power_off_work);
-			} else {
-				cancel_delayed_work(&vpu_service_power_off_work);
-			}
+			__cancel_delayed_work(&vpu_service_power_off_work);
 			vpu_service_power_on();
 			reg_copy_to_hw(reg);
 		}