From c9903c25ab153011f7ab93a0e167fbc78ab616a0 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Thu, 10 Jan 2013 17:32:14 +0200
Subject: [PATCH] --- yaml --- r: 354931 b: refs/heads/master c:
 8e9a4a9a5c8e8765417d54ed6917c7e1e4d09f4d h: refs/heads/master i:   354929:
 ec3689505c0b060568801224686263a84223f804   354927:
 8aa078fbb7ef4ad01c24b1f77d63cfb5d31efbf9 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/misc/mei/client.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a1cf1b0d57ec..4f3ce0beb42c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 627ca75733c84427992d798cfebb8e4fd2428917
+refs/heads/master: 8e9a4a9a5c8e8765417d54ed6917c7e1e4d09f4d
diff --git a/trunk/drivers/misc/mei/client.c b/trunk/drivers/misc/mei/client.c
index d566dd880eb0..a921001053ba 100644
--- a/trunk/drivers/misc/mei/client.c
+++ b/trunk/drivers/misc/mei/client.c
@@ -312,8 +312,9 @@ int mei_cl_unlink(struct mei_cl *cl)
 	if (!cl)
 		return 0;
 
-	if (WARN_ON(!cl->dev))
-		return -EINVAL;
+	/* wd and amthif might not be initialized */
+	if (!cl->dev)
+		return 0;
 
 	dev = cl->dev;