summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorHimanshu Aggarwal <haggarwa@codeaurora.org>2016-01-11 17:30:49 +0530
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:21:51 -0700
commit8370118f626dd21fd9ffcf5271f53dc0ba2df2e7 (patch)
tree734d928292d6cce7ea310dab9f3e27c33f1f7eb3 /drivers/input
parentc91a3304c1b710aa6405233da535f3e745b063f6 (diff)
input: synaptics_dsx_i2c: pass correct QUP Instance to scm call
Pass the correct QUP instance to the scm call. This is required for QUP ownership transfer to other subsystems to support the secure touch usecase. Change-Id: I3ff53544fc58db908669cddce155f786dde23c41 Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c b/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
index 5f9e4484d048..7e7140641646 100644
--- a/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
+++ b/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 2012 Alexandra Chin <alexandra.chin@tw.synaptics.com>
* Copyright (C) 2012 Scott Lin <scott.lin@tw.synaptics.com>
- * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -478,7 +478,7 @@ static int synaptics_i2c_change_pipe_owner(
/* number of arguments */
desc.arginfo = SCM_ARGS(2);
/* BLSPID (1-12) */
- desc.args[0] = i2c->adapter->nr;
+ desc.args[0] = i2c->adapter->nr - 1;
/* Owner if TZ or APSS */
desc.args[1] = subsystem;
ret = scm_call2(SCM_SIP_FNID(SCM_SVC_TZ, TZ_BLSP_MODIFY_OWNERSHIP_ID),