aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 05:29:25 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 11:55:39 -0200
commitac8f04d2723b3de7c36430d67401ce89c858e117 (patch)
tree3fca1fa08368fcf655124254d5aad82379b682f0 /drivers/media
parentb9fd5877463605b91743552b4989666792bf4fbc (diff)
downloadkernel_samsung_crespo-ac8f04d2723b3de7c36430d67401ce89c858e117.zip
kernel_samsung_crespo-ac8f04d2723b3de7c36430d67401ce89c858e117.tar.gz
kernel_samsung_crespo-ac8f04d2723b3de7c36430d67401ce89c858e117.tar.bz2
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/mantis/mantis_hif.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index 621dce3..a2359f7 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;