From: Oliver Endriss Date: Fri, 20 Jun 2008 02:10:14 +0000 (-0300) Subject: V4L/DVB (8074): av7110: OSD transfers should not be interrupted X-Git-Tag: v2.6.26-rc9~91^2~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0b915e74ac10b65da930aa430837d4338f5deb65;p=linux-2.6-omap-h63xx.git V4L/DVB (8074): av7110: OSD transfers should not be interrupted OSD transfers should not be interrupted. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c index c99936c4772..3a3f5279e92 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.c +++ b/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);