From 64d6aa16c2142189fbf45851d7742c7ccc6c5922 Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Fri, 20 Jun 2008 01:10:14 +0200 Subject: av7110: OSD transfers should not be interrupted From: Oliver Endriss OSD transfers should not be interrupted. Signed-off-by: Oliver Endriss --- linux/drivers/media/dvb/ttpci/av7110_hw.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'linux/drivers/media/dvb') 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); -- cgit v1.2.3