diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index d566dd880eb0..a921001053ba 100644
--- a/drivers/misc/mei/client.c
+++ b/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;