diff options
| author | Oliver Endriss <o.endriss@gmx.de> | 2008-06-19 23:10:14 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-26 15:58:56 -0300 |
| commit | 0b915e74ac10b65da930aa430837d4338f5deb65 (patch) | |
| tree | dc3d90cb105a8b9f2f1e33685b476711611c7bc0 | |
| parent | edabaffc7e7fccdeadac6273704102adc2b604ae (diff) | |
| download | linux-3.10-0b915e74ac10b65da930aa430837d4338f5deb65.tar.gz linux-3.10-0b915e74ac10b65da930aa430837d4338f5deb65.tar.bz2 linux-3.10-0b915e74ac10b65da930aa430837d4338f5deb65.zip | |
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>
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110_hw.c | 4 |
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 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); |