From 4e2e20d1c7e9f479ba2a13295ca75edcdfe7c33a Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 27 Aug 2011 11:30:25 -0300 Subject: [PATCH] --- yaml --- r: 271758 b: refs/heads/master c: 94238e9b1946a300b7aeb8bc1ab7f55f6f27e225 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-core/dvb_frontend.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 425cd8019f9f..f78f98e62d6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d3726ae84c3ff499be4f6bcbb805aeab8d812c6 +refs/heads/master: 94238e9b1946a300b7aeb8bc1ab7f55f6f27e225 diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c index 4b05931a098f..2c0acdb4d811 100644 --- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -537,7 +537,6 @@ static int dvb_frontend_thread(void *data) { struct dvb_frontend *fe = data; struct dvb_frontend_private *fepriv = fe->frontend_priv; - unsigned long timeout; fe_status_t s; enum dvbfe_algo algo; @@ -558,7 +557,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, + wait_event_interruptible_timeout(fepriv->wait_queue, dvb_frontend_should_wakeup(fe) || kthread_should_stop() || freezing(current), fepriv->delay);