---

yaml --- r: 354931 b: refs/heads/master c: 8e9a4a9 h: refs/heads/master i: 354929: ec36895 354927: 8aa078f v: v3
git-mirror · Jan 14, 2013 · c9903c2 · c9903c2
1 parent 2c49b5b
commit c9903c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;