aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2005-11-09 00:35:29 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:03 -0500
commitf7b67195ea571b8540ac79daf27f5932ec40c098 (patch)
tree83d34f50eb9035c2c9de5e372a6c86533ab54345 /drivers/media/dvb
parent3528cc4e731b098b5743f8f91516e2e6c01dd1ce (diff)
[PATCH] dvb: Remove DEBUG_LOCKLOSS stuff
Remove DEBUG_LOCKLOSS stuff - as the problem has been found and resolved Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Cc: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/dvb-core/dvb_frontend.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index e36dbd9c4cc5..6ffa6b216363 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -42,8 +42,6 @@
42#include "dvb_frontend.h" 42#include "dvb_frontend.h"
43#include "dvbdev.h" 43#include "dvbdev.h"
44 44
45// #define DEBUG_LOCKLOSS 1
46
47static int dvb_frontend_debug; 45static int dvb_frontend_debug;
48static int dvb_shutdown_timeout = 5; 46static int dvb_shutdown_timeout = 5;
49static int dvb_force_auto_inversion; 47static int dvb_force_auto_inversion;
@@ -438,25 +436,6 @@ static int dvb_frontend_thread(void *data)
438 if (s & FE_HAS_LOCK) 436 if (s & FE_HAS_LOCK)
439 continue; 437 continue;
440 else { /* if we _WERE_ tuned, but now don't have a lock */ 438 else { /* if we _WERE_ tuned, but now don't have a lock */
441#ifdef DEBUG_LOCKLOSS
442 /* first of all try setting the tone again if it was on - this
443 * sometimes works around problems with noisy power supplies */
444 if (fe->ops->set_tone && (fepriv->tone == SEC_TONE_ON)) {
445 fe->ops->set_tone(fe, fepriv->tone);
446 mdelay(100);
447 s = 0;
448 fe->ops->read_status(fe, &s);
449 if (s & FE_HAS_LOCK) {
450 printk("DVB%i: Lock was lost, but regained by setting "
451 "the tone. This may indicate your power supply "
452 "is noisy/slightly incompatable with this DVB-S "
453 "adapter\n", fe->dvb->num);
454 fepriv->state = FESTATE_TUNED;
455 continue;
456 }
457 }
458#endif
459 /* some other reason for losing the lock - start zigzagging */
460 fepriv->state = FESTATE_ZIGZAG_FAST; 439 fepriv->state = FESTATE_ZIGZAG_FAST;
461 fepriv->started_auto_step = fepriv->auto_step; 440 fepriv->started_auto_step = fepriv->auto_step;
462 check_wrapped = 0; 441 check_wrapped = 0;