github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 07:03:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
This reverts commit c41dd26340.
This commit is contained in:
黄涛 2011-07-19 18:10:54 +08:00
parent d035f2c5fb
commit 29492dc9e1
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-rk29/vpu_service.c
View File

@ -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);
}