diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index b98eac38978275f62aafe3d50dcd1ec1621890b2..ca2efc3602df261aa7a526f6f9d3ef46b4c3a4a9 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -122,7 +122,8 @@ int mei_amthif_read(struct mei_device *dev, struct file *file,
 		mutex_unlock(&dev->device_lock);
 
 		wait_ret = wait_event_interruptible(cl->rx_wait,
-					!list_empty(&cl->rd_completed));
+					!list_empty(&cl->rd_completed) ||
+					!mei_cl_is_connected(cl));
 
 		/* Locking again the Mutex */
 		mutex_lock(&dev->device_lock);
@@ -130,6 +131,11 @@ int mei_amthif_read(struct mei_device *dev, struct file *file,
 		if (wait_ret)
 			return -ERESTARTSYS;
 
+		if (!mei_cl_is_connected(cl)) {
+			rets = -EBUSY;
+			goto out;
+		}
+
 		cb = mei_cl_read_cb(cl, file);
 	}