summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2008-06-20 02:10:14 (GMT)
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-26 18:58:56 (GMT)
commit0b915e74ac10b65da930aa430837d4338f5deb65 (patch)
treedc3d90cb105a8b9f2f1e33685b476711611c7bc0 /drivers/media
parentedabaffc7e7fccdeadac6273704102adc2b604ae (diff)
downloadlinux-fsl-qoriq-0b915e74ac10b65da930aa430837d4338f5deb65.tar.xz
V4L/DVB (8074): av7110: OSD transfers should not be interrupted
OSD transfers should not be interrupted. Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/ttpci/av7110_hw.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index c99936c..3a3f527 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);