aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/client.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/mei/client.c')
-rw-r--r--drivers/misc/mei/client.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index a921001053ba..e46663ee76de 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -393,8 +393,8 @@ int mei_cl_disconnect(struct mei_cl *cl)
393 return -ENOMEM; 393 return -ENOMEM;
394 394
395 cb->fop_type = MEI_FOP_CLOSE; 395 cb->fop_type = MEI_FOP_CLOSE;
396 if (dev->mei_host_buffer_is_empty) { 396 if (dev->hbuf_is_ready) {
397 dev->mei_host_buffer_is_empty = false; 397 dev->hbuf_is_ready = false;
398 if (mei_hbm_cl_disconnect_req(dev, cl)) { 398 if (mei_hbm_cl_disconnect_req(dev, cl)) {
399 rets = -ENODEV; 399 rets = -ENODEV;
400 dev_err(&dev->pdev->dev, "failed to disconnect.\n"); 400 dev_err(&dev->pdev->dev, "failed to disconnect.\n");
@@ -496,9 +496,8 @@ int mei_cl_connect(struct mei_cl *cl, struct file *file)
496 496
497 cb->fop_type = MEI_FOP_IOCTL; 497 cb->fop_type = MEI_FOP_IOCTL;
498 498
499 if (dev->mei_host_buffer_is_empty && 499 if (dev->hbuf_is_ready && !mei_cl_is_other_connecting(cl)) {
500 !mei_cl_is_other_connecting(cl)) { 500 dev->hbuf_is_ready = false;
501 dev->mei_host_buffer_is_empty = false;
502 501
503 if (mei_hbm_cl_connect_req(dev, cl)) { 502 if (mei_hbm_cl_connect_req(dev, cl)) {
504 rets = -ENODEV; 503 rets = -ENODEV;
@@ -661,8 +660,8 @@ int mei_cl_read_start(struct mei_cl *cl)
661 660
662 cb->fop_type = MEI_FOP_READ; 661 cb->fop_type = MEI_FOP_READ;
663 cl->read_cb = cb; 662 cl->read_cb = cb;
664 if (dev->mei_host_buffer_is_empty) { 663 if (dev->hbuf_is_ready) {
665 dev->mei_host_buffer_is_empty = false; 664 dev->hbuf_is_ready = false;
666 if (mei_hbm_cl_flow_control_req(dev, cl)) { 665 if (mei_hbm_cl_flow_control_req(dev, cl)) {
667 rets = -ENODEV; 666 rets = -ENODEV;
668 goto err; 667 goto err;