Merge branch 'pm-opp'

[firefly-linux-kernel-4.4.55.git] / drivers / misc / mei / init.c

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 00c3865ca3b1d42042d78d5558eac547ea8c03a8..e374661652cd6a5460556ba8b8661c1e5247a46c 100644 (file)
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -331,7 +331,7 @@ void mei_stop(struct mei_device *dev)
 
        mei_cancel_work(dev);
 
-       mei_nfc_host_exit(dev);
+       mei_cl_bus_remove_devices(dev);
 
        mutex_lock(&dev->device_lock);
 
@@ -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);