Logic error with HRT task completions

1 files changed, 2 insertions, 1 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 8b544ec36e27..0b21d34ceb3d 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -1663,7 +1663,8 @@ static void server_completed(server_t *server, struct task_struct *task)
                 hrt_server = container_of(server, hrt_server_t, server);
                 hrt_server->ready = 0;
 
-                BUG_ON(hrtimer_active(&hrt_server->slack_timer));
+                if (hrtimer_active(&hrt_server->slack_timer))
+                        slack_timer_cancel(hrt_server);
         }
 
         unlink(task);