diff options
| author | Shantanu Jain <shjain@codeaurora.org> | 2016-04-01 10:26:24 +0530 |
|---|---|---|
| committer | Abinaya P <abinayap@codeaurora.org> | 2016-09-12 11:52:37 +0530 |
| commit | 1919671d4d6e4ad74fa14c1c845001efb34f8771 (patch) | |
| tree | ef758abf1214d42f3164a81d0d1a58a1954cc617 /drivers/input | |
| parent | 11d6060fffff4b7e87d1cadb5f65dfc7f74332cc (diff) | |
input: synaptics_dsx_2.6: correct secure_touch_init function
In synaptics_dsx_2.6 touch driver, secure_touch_init tries to get
the QUP clocks for the secure touch functionality. But as these
calls are optional and TZ might get the owenership of these clocks,
this change removes the error return statement, so that the
secure touch can be initialized properly.
Change-Id: I12b5075d484cd397bfb423479589e159a2193f31
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_core.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_core.c b/drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_core.c index eb4947536230..01be860e22a1 100644 --- a/drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_core.c +++ b/drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_core.c @@ -652,8 +652,6 @@ static struct kobj_attribute virtual_key_map_attr = { #if defined(CONFIG_SECURE_TOUCH_SYNAPTICS_DSX_V26) static void synaptics_secure_touch_init(struct synaptics_rmi4_data *data) { - int ret = 0; - data->st_initialized = 0; init_completion(&data->st_powerdown); init_completion(&data->st_irq_processed); @@ -661,24 +659,21 @@ static void synaptics_secure_touch_init(struct synaptics_rmi4_data *data) /* Get clocks */ data->core_clk = devm_clk_get(data->pdev->dev.parent, "core_clk"); if (IS_ERR(data->core_clk)) { - ret = PTR_ERR(data->core_clk); - data->core_clk = NULL; dev_warn(data->pdev->dev.parent, - "%s: error on clk_get(core_clk): %d\n", __func__, ret); - return; + "%s: error on clk_get(core_clk): %ld\n", __func__, + PTR_ERR(data->core_clk)); + data->core_clk = NULL; } data->iface_clk = devm_clk_get(data->pdev->dev.parent, "iface_clk"); if (IS_ERR(data->iface_clk)) { - ret = PTR_ERR(data->iface_clk); - data->iface_clk = NULL; dev_warn(data->pdev->dev.parent, - "%s: error on clk_get(iface_clk): %d\n", __func__, ret); - return; + "%s: error on clk_get(iface_clk): %ld\n", __func__, + PTR_ERR(data->iface_clk)); + data->iface_clk = NULL; } data->st_initialized = 1; - return; } static void synaptics_secure_touch_notify(struct synaptics_rmi4_data *rmi4_data) |