From af9ae7e79c28fa9211e2096dd698a7b56c53e733 Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Thu, 19 Jun 2008 23:10:14 -0300 Subject: [PATCH] --- yaml --- r: 98505 b: refs/heads/master c: 0b915e74ac10b65da930aa430837d4338f5deb65 h: refs/heads/master i: 98503: 1374266168e750f22dd137c2d4646eb7983ac3dc v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/ttpci/av7110_hw.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 035dbf7f507f..6960008a8cbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edabaffc7e7fccdeadac6273704102adc2b604ae +refs/heads/master: 0b915e74ac10b65da930aa430837d4338f5deb65 diff --git a/trunk/drivers/media/dvb/ttpci/av7110_hw.c b/trunk/drivers/media/dvb/ttpci/av7110_hw.c index c99936c4772a..3a3f5279e927 100644 --- a/trunk/drivers/media/dvb/ttpci/av7110_hw.c +++ b/trunk/drivers/media/dvb/ttpci/av7110_hw.c @@ -854,10 +854,8 @@ static osd_raw_window_t bpp2bit[8] = { static inline int WaitUntilBmpLoaded(struct av7110 *av7110) { - int ret = wait_event_interruptible_timeout(av7110->bmpq, + int ret = wait_event_timeout(av7110->bmpq, av7110->bmp_state != BMP_LOADING, 10*HZ); - if (ret == -ERESTARTSYS) - return ret; if (ret == 0) { printk("dvb-ttpci: warning: timeout waiting in LoadBitmap: %d, %d\n", ret, av7110->bmp_state);