aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorakpm@linux-foundation.org <akpm@linux-foundation.org>2007-02-08 12:36:57 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:35:20 -0500
commit6591691b259f9487f374f35c0c310aa220f829c6 (patch)
treeb132ae2c8f1af669cf4ca194d42e805020fb83ca /drivers/media
parent8eec14295e03f9dfe2be7bb75c8004a5fa867cdb (diff)
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)
525 525
526 while (1) { 526 while (1) {
527 up(&fepriv->sem); /* is locked when we enter the thread... */ 527 up(&fepriv->sem); /* is locked when we enter the thread... */
528 528restart:
529 timeout = wait_event_interruptible_timeout(fepriv->wait_queue, 529 timeout = wait_event_interruptible_timeout(fepriv->wait_queue,
530 dvb_frontend_should_wakeup(fe) || kthread_should_stop(), 530 dvb_frontend_should_wakeup(fe) || kthread_should_stop(),
531 fepriv->delay); 531 fepriv->delay);
@@ -536,7 +536,7 @@ static int dvb_frontend_thread(void *data)
536 } 536 }
537 537
538 if (try_to_freeze()) 538 if (try_to_freeze())
539 continue; 539 goto restart;
540 540
541 if (down_interruptible(&fepriv->sem)) 541 if (down_interruptible(&fepriv->sem))
542 break; 542 break;