From 8370118f626dd21fd9ffcf5271f53dc0ba2df2e7 Mon Sep 17 00:00:00 2001 From: Himanshu Aggarwal Date: Mon, 11 Jan 2016 17:30:49 +0530 Subject: 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 --- drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c | 4 ++-- 1 file 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 * Copyright (C) 2012 Scott Lin - * 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), -- cgit v1.2.3