From: Guzman Lugo, Fernando Date: Tue, 26 Oct 2010 00:51:46 +0000 (+0000) Subject: staging: tidspbridge: make sync_wait_on_event interruptible X-Git-Tag: MMI-PSA29.97-13-9~20521^2~588^2~36 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4097c4968cd60bf5c690455466731d11149fe43f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: tidspbridge: make sync_wait_on_event interruptible So that avoid non-killable process. Signed-off-by: Fernando Guzman Lugo Signed-off-by: Omar Ramirez Luna --- diff --git a/drivers/staging/tidspbridge/include/dspbridge/sync.h b/drivers/staging/tidspbridge/include/dspbridge/sync.h index e2651e7b1c42..df05b8f8e230 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/sync.h +++ b/drivers/staging/tidspbridge/include/dspbridge/sync.h @@ -80,13 +80,22 @@ void sync_set_event(struct sync_object *event); * This functios will wait until @event is set or until timeout. In case of * success the function will return 0 and * in case of timeout the function will return -ETIME + * in case of signal the function will return -ERESTARTSYS */ static inline int sync_wait_on_event(struct sync_object *event, unsigned timeout) { - return wait_for_completion_timeout(&event->comp, - msecs_to_jiffies(timeout)) ? 0 : -ETIME; + int res; + + res = wait_for_completion_interruptible_timeout(&event->comp, + msecs_to_jiffies(timeout)); + if (!res) + res = -ETIME; + else if (res > 0) + res = 0; + + return res; } /**