summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2008-06-20 01:10:14 +0200
committerOliver Endriss <o.endriss@gmx.de>2008-06-20 01:10:14 +0200
commit64d6aa16c2142189fbf45851d7742c7ccc6c5922 (patch)
tree1b66de589b82a8a9b03068d5aa79ca0732276e00 /linux/drivers/media/dvb
parent87b85aa09a60471a0c2f8385a79834ea2481ff5d (diff)
downloadmediapointer-dvb-s2-64d6aa16c2142189fbf45851d7742c7ccc6c5922.tar.gz
mediapointer-dvb-s2-64d6aa16c2142189fbf45851d7742c7ccc6c5922.tar.bz2
av7110: OSD transfers should not be interrupted
From: Oliver Endriss <o.endriss@gmx.de> OSD transfers should not be interrupted. Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110_hw.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_hw.c b/linux/drivers/media/dvb/ttpci/av7110_hw.c
index 431c77b39..afae0266a 100644
--- a/linux/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/linux/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);