From 9d5382acae21159e303c1c148f2946c90a4c227c Mon Sep 17 00:00:00 2001
From: Arvo Jarve <arvo@softshark.ee>
Date: Mon, 20 Oct 2008 06:05:21 -0300
Subject: [PATCH] --- yaml --- r: 124010 b: refs/heads/master c:
 7bcbdf386bdc2ea2bcd916a7b972ad7bca14db04 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/dvb/dvb-core/dvb_frontend.c | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 9dfaf696fc89..275effa834cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c59e7870fddbbc232221f92fb24958c605be404c
+refs/heads/master: 7bcbdf386bdc2ea2bcd916a7b972ad7bca14db04
diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
index d006f042f22e..d30e00ff36f1 100644
--- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -601,27 +601,33 @@ static int dvb_frontend_thread(void *data)
 				 * requesting a search with a new set of parameters
 				 */
 				if (fepriv->algo_status & DVBFE_ALGO_SEARCH_AGAIN) {
-					if (fe->ops.search)
+					if (fe->ops.search) {
 						fepriv->algo_status = fe->ops.search(fe, &fepriv->parameters);
 						/* We did do a search as was requested, the flags are
 						 * now unset as well and has the flags wrt to search.
 						 */
-
-					fepriv->algo_status &= ~DVBFE_ALGO_SEARCH_AGAIN;
+					} else {
+						fepriv->algo_status &= ~DVBFE_ALGO_SEARCH_AGAIN;
+					}
 				}
 				/* Track the carrier if the search was successful */
 				if (fepriv->algo_status == DVBFE_ALGO_SEARCH_SUCCESS) {
-					if (fepriv->algo_status & DVBFE_ALGO_SEARCH_SUCCESS)
-						dprintk("%s: status = DVBFE_ALGO_SEARCH_SUCCESS\n", __func__);
-					if (fepriv->algo_status & DVBFE_ALGO_SEARCH_FAILED)
-						fepriv->algo_status |= DVBFE_ALGO_SEARCH_AGAIN;
-
-					fe->ops.read_status(fe, &s);
-					dvb_frontend_add_event(fe, s); /* update event list */
-					fepriv->status = s;
 					if (fe->ops.track)
 						fe->ops.track(fe, &fepriv->parameters);
-
+				} else {
+					fepriv->algo_status |= DVBFE_ALGO_SEARCH_AGAIN;
+					fepriv->delay = HZ / 2;
+				}
+				fe->ops.read_status(fe, &s);
+				if (s != fepriv->status) {
+					dvb_frontend_add_event(fe, s); /* update event list */
+					fepriv->status = s;
+					if (!(s & FE_HAS_LOCK)) {
+						fepriv->delay = HZ / 10;
+						fepriv->algo_status |= DVBFE_ALGO_SEARCH_AGAIN;
+					} else {
+						fepriv->delay = 60 * HZ;
+					}
 				}
 				break;
 			default: