mei: introduce host client uninitialized state

Introduce a new host client state, MEI_FILE_UNINITIALIZED,
to distinguish client objects that was unlinked,
but not destroyed and can be linked again.

Signed-off-by: Alexander Usyskin <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index c71cee8bd9577124730b0ec524045f582063a99d..46ee9155ada619d9d7160cc31090e6b231c4a391 100644 (file)
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -571,7 +571,7 @@ void mei_cl_init(struct mei_cl *cl, struct mei_device *dev)
        INIT_LIST_HEAD(&cl->rd_pending);
        INIT_LIST_HEAD(&cl->link);
        cl->writing_state = MEI_IDLE;
-       cl->state = MEI_FILE_INITIALIZING;
+       cl->state = MEI_FILE_UNINITIALIZED;
        cl->dev = dev;
 }
 
@@ -672,7 +672,7 @@ int mei_cl_unlink(struct mei_cl *cl)
 
        list_del_init(&cl->link);
 
-       cl->state = MEI_FILE_INITIALIZING;
+       cl->state = MEI_FILE_UNINITIALIZED;
 
        return 0;
 }
@@ -756,7 +756,7 @@ void mei_cl_set_disconnected(struct mei_cl *cl)
        struct mei_device *dev = cl->dev;
 
        if (cl->state == MEI_FILE_DISCONNECTED ||
-           cl->state == MEI_FILE_INITIALIZING)
+           cl->state <= MEI_FILE_INITIALIZING)
                return;
 
        cl->state = MEI_FILE_DISCONNECTED;

diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 93b150315b93428daa74518280cbc54edeafd82a..82e69a00b7a156fef0020a6ce14606d08bc5eac2 100644 (file)
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -55,7 +55,8 @@ extern const uuid_le mei_amthif_guid;
 
 /* File state */
 enum file_state {
-       MEI_FILE_INITIALIZING = 0,
+       MEI_FILE_UNINITIALIZED = 0,
+       MEI_FILE_INITIALIZING,
        MEI_FILE_CONNECTING,
        MEI_FILE_CONNECTED,
        MEI_FILE_DISCONNECTING,