summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHu Bingquan <bingquan.hu@intel.com>2017-01-17 10:56:53 +0800
committerjenkins_ndg <jenkins_ndg@intel.com>2017-01-25 00:54:31 -0800
commit84ae8a7f5153031c2b2440fb3d80484c9ea55349 (patch)
treef52fee9ded21355ed5e24af15474fa06dab43ff3
parent61caa81fcc9f9765de4228fe79cd0087182d75aa (diff)
downloadx86-android-x86-anthracite-3.10-nougat-mr1-wear-release.tar.gz
The mod_timer might be called the workqueue handler, and also from the power_enable sys nodes, they might collide. The fix is to protect again this collision. Change-Id: Iae939ab1fe4dfdf9b1fb1c75d19ebfe146ae9dcd Tracked-On: https://jira01.devtools.intel.com/browse/AW-3861 Signed-off-by: Hu Bingquan <bingquan.hu@intel.com> Reviewed-on: https://android.intel.com/563390 Reviewed-by: jenkins_ndg <jenkins_ndg@intel.com> Reviewed-by: Nassiet, GaelleX <gaellex.nassiet@intel.com> Reviewed-by: Rouis, KhalifaX <khalifax.rouis@intel.com> Reviewed-by: Dubray, SimonX <simonx.dubray@intel.com> Reviewed-by: Ledentec, AlexandreX <alexandrex.ledentec@intel.com> Reviewed-by: Lachaud, EtienneX <etiennex.lachaud@intel.com> Reviewed-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com>
-rw-r--r--drivers/input/misc/tsl2583.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/tsl2583.c b/drivers/input/misc/tsl2583.c
index cbfc91d558a2..ff9273ff0159 100644
--- a/drivers/input/misc/tsl2583.c
+++ b/drivers/input/misc/tsl2583.c
@@ -696,9 +696,9 @@ static void taos_workqueue_handler(struct work_struct *work)
/* Sync it up */
input_sync(chip->input);
}
- mutex_unlock(&chip->als_mutex);
mod_timer(&chip->timer,
jiffies + msecs_to_jiffies(chip->taos_settings.als_odr));
+ mutex_unlock(&chip->als_mutex);
}