From: Aaro Koskinen Date: Thu, 24 Mar 2011 06:48:19 +0000 (-0700) Subject: Input: tsc2005 - fix locking issue X-Git-Tag: v2.6.39-rc1~58^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0fa2206f550066d6948d43c5401e973e5f7d320;p=pandora-kernel.git Input: tsc2005 - fix locking issue Commit 0b950d3 (Input: tsc2005 - add open/close) introduced a locking issue with the ESD watchdog: __tsc2005_disable() is calling cancel_delayed_work_sync() with mutex held, and the work also needs the same mutex. Fix the problem by using mutex_trylock() in tsc2005_esd_work(). If the mutex is taken, we know we are in the middle of disable or enable and the watchdog check can be skipped. Signed-off-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov --- Reading git-diff-tree failed