From: Manu Abraham <abraham.manu@gmail.com>
Date: Fri, 4 Dec 2009 08:29:25 +0000 (-0300)
Subject: V4L/DVB (13776): [Mantis] Use a simple timeout instead, interruptible
X-Git-Tag: firefly_0821_release~9833^2~3333^2~39
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ac8f04d2723b3de7c36430d67401ce89c858e117;p=firefly-linux-kernel-4.4.55.git

V4L/DVB (13776): [Mantis] Use a simple timeout instead, interruptible

timeouts sleep unnecessarily too long

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index 621dce3eb5d6..a2359f7e1465 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -44,9 +44,9 @@ static int mantis_hif_sbuf_opdone_wait(struct mantis_ca *ca)
 	struct mantis_pci *mantis = ca->ca_priv;
 	int rc = 0;
 
-	if (wait_event_interruptible_timeout(ca->hif_opdone_wq,
-					     ca->hif_event & MANTIS_SBUF_OPDONE,
-					     msecs_to_jiffies(500)) == -ERESTARTSYS) {
+	if (wait_event_timeout(ca->hif_opdone_wq,
+			       ca->hif_event & MANTIS_SBUF_OPDONE,
+			       msecs_to_jiffies(500)) == -ERESTARTSYS) {
 
 		dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): Smart buffer operation timeout !", mantis->num);
 		rc = -EREMOTEIO;