summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorakpm@linux-foundation.org <akpm@linux-foundation.org>2007-02-08 14:36:57 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:35:20 -0200
commit6591691b259f9487f374f35c0c310aa220f829c6 (patch)
treeb132ae2c8f1af669cf4ca194d42e805020fb83ca /drivers/media
parent8eec14295e03f9dfe2be7bb75c8004a5fa867cdb (diff)
downloadblackbird-op-linux-6591691b259f9487f374f35c0c310aa220f829c6.tar.gz
blackbird-op-linux-6591691b259f9487f374f35c0c310aa220f829c6.zip
V4L/DVB (5209): Kthread api conversion for dvb_frontend and av7110 fix
avoid double-up(), pointed out by Oliver. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-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/dvb-core/dvb_frontend.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 470ae167beb9..a21a894d3f98 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -525,7 +525,7 @@ static int dvb_frontend_thread(void *data)
while (1) {
up(&fepriv->sem); /* is locked when we enter the thread... */
-
+restart:
timeout = wait_event_interruptible_timeout(fepriv->wait_queue,
dvb_frontend_should_wakeup(fe) || kthread_should_stop(),
fepriv->delay);
@@ -536,7 +536,7 @@ static int dvb_frontend_thread(void *data)
}
if (try_to_freeze())
- continue;
+ goto restart;
if (down_interruptible(&fepriv->sem))
break;
OpenPOWER on IntegriCloud