From ba43ee86ce530a410a037ab4ebe106634e47ab3d Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 18 Jul 2011 17:09:05 -0700
Subject: [PATCH] --- yaml --- r: 260787 b: refs/heads/master c:
 e449edbb91decd0260105fadd4f5fcc3ce170e01 h: refs/heads/master i:   260785:
 72e6d993954ad86d1653995c62cd86aa5e270ac1   260783:
 dd0cda376e1c8b56df5c76ec1ca741b47857e8f9 v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/input/touchscreen/intel-mid-touch.c | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 2bd00808efc8..54bb3da7277b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc3e8247eb90655c0ff01ce03bdf3aa5868f1cde
+refs/heads/master: e449edbb91decd0260105fadd4f5fcc3ce170e01
diff --git a/trunk/drivers/input/touchscreen/intel-mid-touch.c b/trunk/drivers/input/touchscreen/intel-mid-touch.c
index 66c96bfc5522..327695268e06 100644
--- a/trunk/drivers/input/touchscreen/intel-mid-touch.c
+++ b/trunk/drivers/input/touchscreen/intel-mid-touch.c
@@ -448,15 +448,11 @@ static int __devinit mrstouch_read_pmic_id(uint *vendor, uint *rev)
  */
 static int __devinit mrstouch_chan_parse(struct mrstouch_dev *tsdev)
 {
-	int err, i, found;
+	int found = 0;
+	int err, i;
 	u8 r8;
 
-	found = -1;
-
 	for (i = 0; i < MRSTOUCH_MAX_CHANNELS; i++) {
-		if (found >= 0)
-			break;
-
 		err = intel_scu_ipc_ioread8(PMICADDR0 + i, &r8);
 		if (err)
 			return err;
@@ -466,16 +462,15 @@ static int __devinit mrstouch_chan_parse(struct mrstouch_dev *tsdev)
 			break;
 		}
 	}
-	if (found < 0)
-		return 0;
 
 	if (tsdev->vendor == PMIC_VENDOR_FS) {
-		if (found && found > (MRSTOUCH_MAX_CHANNELS - 18))
+		if (found > MRSTOUCH_MAX_CHANNELS - 18)
 			return -ENOSPC;
 	} else {
-		if (found && found > (MRSTOUCH_MAX_CHANNELS - 4))
+		if (found > MRSTOUCH_MAX_CHANNELS - 4)
 			return -ENOSPC;
 	}
+
 	return found;
 }