Revert "rk29: vpu_service: fix bug when __cancel_delayed_work and delay work run...

This reverts commit c41dd263406cad12ec15d39986a530be1d23ad11.

diff --git a/arch/arm/mach-rk29/vpu_service.c b/arch/arm/mach-rk29/vpu_service.c
index 35c64a99815d627f5be1d83e43ecb280b42e7f9c..b0d08b29967dcadf526a94d50e63e12cc56b8daf 100644 (file)
--- 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);
                }