From 051ac97566edd267d24a1d15eb9cff5b0c44887a Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Fri, 4 Dec 2009 05:29:25 -0300 Subject: [PATCH] --- yaml --- r: 179514 b: refs/heads/master c: ac8f04d2723b3de7c36430d67401ce89c858e117 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/mantis/mantis_hif.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a05dd2db965c..7c49f611e554 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9fd5877463605b91743552b4989666792bf4fbc +refs/heads/master: ac8f04d2723b3de7c36430d67401ce89c858e117 diff --git a/trunk/drivers/media/dvb/mantis/mantis_hif.c b/trunk/drivers/media/dvb/mantis/mantis_hif.c index 621dce3eb5d6..a2359f7e1465 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_hif.c +++ b/trunk/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;