From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 6 Sep 2005 22:19:02 +0000 (-0700)
Subject: [PATCH] Corgi touchscreen: Fix a pmu bug
X-Git-Tag: v2.6.14-rc1~582
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8cc3c7af42aa826d413e3134628d85f3920457d8;p=linux-2.6-omap-h63xx.git

[PATCH] Corgi touchscreen: Fix a pmu bug

Corgi Touchscreen bugfix.  If the PMU isn't running, the register needs to
be set to a sane value rather than reusing some random value.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 768ab4a5563..512940ecb35 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -105,7 +105,7 @@ static int sync_receive_data_send_cmd(int doRecive, int doSend, unsigned int add
 	if (wait_time && doSend) {
 		PMNC_GET(pmnc);
 		if (!(pmnc & 0x01))
-			PMNC_SET(pmnc | 0x01);
+			PMNC_SET(0x01);
 
 		/* polling HSync */
 		SyncHS();