These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / misc / mei / init.c

diff --git a/kernel/drivers/misc/mei/init.c b/kernel/drivers/misc/mei/init.c
index 97353cf..3edafc8 100644 (file)
--- a/kernel/drivers/misc/mei/init.c
+++ b/kernel/drivers/misc/mei/init.c
@@ -329,12 +329,10 @@ void mei_stop(struct mei_device *dev)
 {
        dev_dbg(dev->dev, "stopping the device.\n");
 
-       mei_cancel_work(dev);
-
-       mei_nfc_host_exit(dev);
-
        mei_cl_bus_remove_devices(dev);
 
+       mei_cancel_work(dev);
+
        mutex_lock(&dev->device_lock);
 
        mei_wd_stop(dev);
@@ -361,13 +359,15 @@ bool mei_write_is_idle(struct mei_device *dev)
 {
        bool idle = (dev->dev_state == MEI_DEV_ENABLED &&
                list_empty(&dev->ctrl_wr_list.list) &&
-               list_empty(&dev->write_list.list));
+               list_empty(&dev->write_list.list)   &&
+               list_empty(&dev->write_waiting_list.list));
 
-       dev_dbg(dev->dev, "write pg: is idle[%d] state=%s ctrl=%d write=%d\n",
+       dev_dbg(dev->dev, "write pg: is idle[%d] state=%s ctrl=%01d write=%01d wwait=%01d\n",
                idle,
                mei_dev_state_str(dev->dev_state),
                list_empty(&dev->ctrl_wr_list.list),
-               list_empty(&dev->write_list.list));
+               list_empty(&dev->write_list.list),
+               list_empty(&dev->write_waiting_list.list));
 
        return idle;
 }
@@ -390,6 +390,7 @@ void mei_device_init(struct mei_device *dev,
        INIT_LIST_HEAD(&dev->me_clients);
        mutex_init(&dev->device_lock);
        init_rwsem(&dev->me_clients_rwsem);
+       mutex_init(&dev->cl_bus_lock);
        init_waitqueue_head(&dev->wait_hw_ready);
        init_waitqueue_head(&dev->wait_pg);
        init_waitqueue_head(&dev->wait_hbm_start);