diff options
Diffstat (limited to 'kernel/power/qos.c')
-rw-r--r-- | kernel/power/qos.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 168ff442ebde..97b0df71303e 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c | |||
@@ -482,16 +482,7 @@ void pm_qos_update_request(struct pm_qos_request *req, | |||
482 | return; | 482 | return; |
483 | } | 483 | } |
484 | 484 | ||
485 | /* | 485 | cancel_delayed_work_sync(&req->work); |
486 | * This function may be called very early during boot, for example, | ||
487 | * from of_clk_init(), where irq needs to stay disabled. | ||
488 | * cancel_delayed_work_sync() assumes that irq is enabled on | ||
489 | * invocation and re-enables it on return. Avoid calling it until | ||
490 | * workqueue is initialized. | ||
491 | */ | ||
492 | if (keventd_up()) | ||
493 | cancel_delayed_work_sync(&req->work); | ||
494 | |||
495 | __pm_qos_update_request(req, new_value); | 486 | __pm_qos_update_request(req, new_value); |
496 | } | 487 | } |
497 | EXPORT_SYMBOL_GPL(pm_qos_update_request); | 488 | EXPORT_SYMBOL_GPL(pm_qos_update_request); |