| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1277378021-16802-6-git-send-email-l.fu@pengutronix.de> Date: Thu, 24 Jun 2010 13:13:40 +0200 From: Luotao Fu <l.fu@...gutronix.de> To: Rabin VINCENT <rabin.vincent@...ricsson.com>, Samuel Ortiz <sameo@...ux.intel.com>, Dmitry Torokhov <dmitry.torokhov@...il.com> Cc: Linus WALLEIJ <linus.walleij@...ricsson.com>, linux-kernel@...r.kernel.org, linux-input@...r.kernel.org, STEricsson_nomadik_linux <STEricsson_nomadik_linux@...t.st.com>, Luotao Fu <l.fu@...gutronix.de> Subject: [PATCH 5/6] mfd/stmpexxx: fix stmpe811 enable hook Fix the stmpe811 enable hook so that we can activate the needed clocks for the touchscreen controller. Signed-off-by: Luotao Fu <l.fu@...gutronix.de> --- drivers/mfd/stmpe-devices.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/stmpe-devices.c b/drivers/mfd/stmpe-devices.c index 3e21c26..25941ea 100644 --- a/drivers/mfd/stmpe-devices.c +++ b/drivers/mfd/stmpe-devices.c @@ -117,8 +117,9 @@ static int stmpe811_enable(struct stmpe *stmpe, unsigned int blocks, if (blocks & STMPE_BLOCK_ADC) mask |= STMPE811_SYS_CTRL2_ADC_OFF; - if (blocks & STMPE_BLOCK_KEYPAD) - mask |= STMPE811_SYS_CTRL2_TSC_OFF; + if (blocks & STMPE_BLOCK_TOUCHSCREEN) + mask |= STMPE811_SYS_CTRL2_ADC_OFF + | STMPE811_SYS_CTRL2_TSC_OFF; return stmpe_set_bits(stmpe, STMPE811_REG_SYS_CTRL2, mask, enable ? 0 : mask); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists