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;