Merge branch 'pm-cpufreq'

[karo-tx-linux.git] / kernel / livepatch / core.c

diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index c40ebcca0495fc5fb003e44c4c6549bc39fcd08d..6e5344112419ca43ace3474466db35d1692752ab 100644 (file)
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -348,8 +348,10 @@ static void klp_disable_func(struct klp_func *func)
 {
        struct klp_ops *ops;
 
-       WARN_ON(func->state != KLP_ENABLED);
-       WARN_ON(!func->old_addr);
+       if (WARN_ON(func->state != KLP_ENABLED))
+               return;
+       if (WARN_ON(!func->old_addr))
+               return;
 
        ops = klp_find_ops(func->old_addr);
        if (WARN_ON(!ops))