From b95f8645502b927b87af5724ab2acb030d7a0314 Mon Sep 17 00:00:00 2001 From: "nengwen.chen" Date: Tue, 13 Aug 2019 14:50:03 +0800 Subject: [PATCH] atv_demod: fixed null pointer when atv channel searching [1/1] PD#TV-8777 Problem: fixed null pointer when atv chennel searching. Solution: 1.fixed null pointer when atv channel searching. Verify: Verified by x301 and t972. Change-Id: I3622d42f6a8dee634c601660b43e9dd9ba93c29d Signed-off-by: nengwen.chen --- drivers/amlogic/atv_demod/atv_demod_ops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/amlogic/atv_demod/atv_demod_ops.c b/drivers/amlogic/atv_demod/atv_demod_ops.c index 9c19917cbd20..e0ed0046b285 100644 --- a/drivers/amlogic/atv_demod/atv_demod_ops.c +++ b/drivers/amlogic/atv_demod/atv_demod_ops.c @@ -1121,7 +1121,8 @@ static enum v4l2_search atvdemod_fe_search(struct v4l2_frontend *v4l2_fe) !fe->ops.tuner_ops.get_status || !fe->ops.analog_ops.has_signal || !fe->ops.analog_ops.set_params || - !fe->ops.analog_ops.set_config)) { + !fe->ops.analog_ops.set_config || + !aml_fe_hook_set_mode || !aml_fe_hook_set_mode)) { pr_err("[%s] error: NULL function or pointer.\n", __func__); return V4L2_SEARCH_INVALID; } @@ -1135,6 +1136,7 @@ static enum v4l2_search atvdemod_fe_search(struct v4l2_frontend *v4l2_fe) if (p->afc_range == 0) { pr_err("[%s] afc_range == 0, skip the search\n", __func__); aml_fe_hook_set_mode(0); + return V4L2_SEARCH_INVALID; } else { aml_fe_hook_set_mode(1);