From 09322d9ab994c8d7ead5fe2666ef05e9b9e98ded Mon Sep 17 00:00:00 2001 From: Gilberto Gambugge Date: Fri, 24 Jul 2020 15:32:17 -0300 Subject: [PATCH] nt36xx: Fix bld error due to wakeup_api_changes The goto statement needs to be enclosed by NVT_SENSOR_EN. For devices where this is not defined, we have the following build error: +++++++++++++++++++++++++++++++++++++++++++ motorola/kernel/modules/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c:2239:1: warning: label 'err_wakeup_source_register_failed' defined but not used [-Wunused-label] error, forbidden warning: nt36xxx.c:2239 +++++++++++++++++++++++++++++++++++++++++++ NO_PROP_NEEDED: Change-Id: Icecdcec4f169c30250c03a23006891ffb25c53bc Reviewed-on: https://gerrit.mot.com/1705821 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Ling Jin Submit-Approved: Sergio Vilela --- drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c index d78fcef19c1c..45e8c7439010 100644 --- a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c +++ b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c @@ -2235,9 +2235,11 @@ err_register_charger_notify_failed: err_charger_detection_alloc_failed: err_charger_notify_wq_failed: free_irq(client->irq, ts); +#ifdef NVT_SENSOR_EN #ifndef CONFIG_HAS_WAKELOCK err_wakeup_source_register_failed: #endif +#endif err_int_request_failed: input_unregister_device(ts->input_dev); ts->input_dev = NULL;