From b7bcb2bd6808513e5b647e68a9bd782a6d6b7366 Mon Sep 17 00:00:00 2001 From: "nengwen.chen" Date: Wed, 18 Sep 2019 13:11:57 +0800 Subject: [PATCH] atv_demod: remove 44.25 repeat try signal [1/1] PD#TV-10334 Problem: 1.remove 44.25MHz repeat try signal. Solution: 1.remove 44.25MHz repeat try signal. Verify: Verified by x301 Change-Id: I76608f76885f555dfa5849e8e9016757736c2de8 Signed-off-by: nengwen.chen --- drivers/amlogic/atv_demod/atv_demod_ops.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/amlogic/atv_demod/atv_demod_ops.c b/drivers/amlogic/atv_demod/atv_demod_ops.c index 88affa4dd8ce..daed41862081 100644 --- a/drivers/amlogic/atv_demod/atv_demod_ops.c +++ b/drivers/amlogic/atv_demod/atv_demod_ops.c @@ -1117,7 +1117,7 @@ static enum v4l2_search atvdemod_fe_search(struct v4l2_frontend *v4l2_fe) v4l2_std_id std_bk = 0; unsigned int audio = 0; unsigned int soundsys = 0; - int double_check_cnt = 1; + /* int double_check_cnt = 1; */ int auto_search_std = 0; int search_count = 0; /* bool try_secam = false; */ @@ -1266,7 +1266,7 @@ static enum v4l2_search atvdemod_fe_search(struct v4l2_frontend *v4l2_fe) /* when manual search, just search current freq */ if (p->flag == ANALOG_FLAG_MANUL_SCAN) break; - +#ifdef DOUBLE_CHECK_44_25MHZ if (p->frequency >= 44200000 && p->frequency <= 44300000 && double_check_cnt) { @@ -1277,6 +1277,11 @@ static enum v4l2_search atvdemod_fe_search(struct v4l2_frontend *v4l2_fe) p->frequency += afc_step * ((search_count % 2) ? -search_count : search_count); } +#else + ++search_count; + p->frequency += afc_step * ((search_count % 2) ? + -search_count : search_count); +#endif } pr_dbg("[%s] [%d] over of range [min=%d, max=%d], search failed.\n",