From 94eee400f5a1874128837be1b4da41b86023ff30 Mon Sep 17 00:00:00 2001
From: Henrik Rydberg <rydberg@euromail.se>
Date: Wed, 8 Aug 2012 21:45:50 +0200
Subject: [PATCH] --- yaml --- r: 323490 b: refs/heads/master c:
 94b5485cdd88cb88320c97727382c27e86de3979 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/hid/hid-multitouch.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index edcc2809454a..f278411f89b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d77104adb52a177ea85c2ff2311551cef67d52b
+refs/heads/master: 94b5485cdd88cb88320c97727382c27e86de3979
diff --git a/trunk/drivers/hid/hid-multitouch.c b/trunk/drivers/hid/hid-multitouch.c
index 7b7fdc1149f1..86963a9970ba 100644
--- a/trunk/drivers/hid/hid-multitouch.c
+++ b/trunk/drivers/hid/hid-multitouch.c
@@ -691,12 +691,10 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
 	struct mt_device *td;
 	struct mt_class *mtclass = mt_classes; /* MT_CLS_DEFAULT */
 
-	if (id) {
-		for (i = 0; mt_classes[i].name ; i++) {
-			if (id->driver_data == mt_classes[i].name) {
-				mtclass = &(mt_classes[i]);
-				break;
-			}
+	for (i = 0; mt_classes[i].name ; i++) {
+		if (id->driver_data == mt_classes[i].name) {
+			mtclass = &(mt_classes[i]);
+			break;
 		}
 	}