From e05a3908ecafdcc611ed9189c64c94cdcf2c2c4a Mon Sep 17 00:00:00 2001
From: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Date: Tue, 4 Dec 2012 16:27:52 +0100
Subject: [PATCH] --- yaml --- r: 343066 b: refs/heads/master c:
 6233362852785dbaffe1896d62ec834faf53fb57 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/hid/i2c-hid/i2c-hid.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c0c7f4bbe8a8..3f7bd3c87699 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c737bcf92ea206d3b5d351890f1ade9e12ad4cbe
+refs/heads/master: 6233362852785dbaffe1896d62ec834faf53fb57
diff --git a/trunk/drivers/hid/i2c-hid/i2c-hid.c b/trunk/drivers/hid/i2c-hid/i2c-hid.c
index c823a16f35ac..3bbd70e839f2 100644
--- a/trunk/drivers/hid/i2c-hid/i2c-hid.c
+++ b/trunk/drivers/hid/i2c-hid/i2c-hid.c
@@ -901,9 +901,6 @@ static int __devexit i2c_hid_remove(struct i2c_client *client)
 	struct i2c_hid *ihid = i2c_get_clientdata(client);
 	struct hid_device *hid;
 
-	if (WARN_ON(!ihid))
-		return -1;
-
 	hid = ihid->hid;
 	hid_destroy_device(hid);