Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ebdc364 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: fix hbm MEI_HBM_STARTED ambiguity 



We have MEI_HBM_STARTED in two contexts one
after start message was received and second
after enumeration was completed.
Because after start message reception we move
immediately to the enumeration state, we need
only the later meaning.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a176c24d

drivers/misc/mei/hbm.c

+0 −2
Original line number Diff line number Diff line
@@ -806,8 +806,6 @@ int mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr) 
			return -EPROTO;

		}



		dev->hbm_state = MEI_HBM_STARTED;



		if (mei_hbm_enum_clients_req(dev)) {

			dev_err(dev->dev, "hbm: start: failed to send enumeration request\n");

			return -EIO;

drivers/misc/mei/hbm.h

+2 −2
Original line number Diff line number Diff line
@@ -26,17 +26,17 @@ struct mei_cl; 
 *

 * @MEI_HBM_IDLE : protocol not started

 * @MEI_HBM_STARTING : start request message was sent

 * @MEI_HBM_STARTED : start reply message was received

 * @MEI_HBM_ENUM_CLIENTS : enumeration request was sent

 * @MEI_HBM_CLIENT_PROPERTIES : acquiring clients properties

 * @MEI_HBM_STARTED : enumeration was completed

 * @MEI_HBM_STOPPED : stopping exchange

 */

enum mei_hbm_state {

	MEI_HBM_IDLE = 0,

	MEI_HBM_STARTING,

	MEI_HBM_STARTED,

	MEI_HBM_ENUM_CLIENTS,

	MEI_HBM_CLIENT_PROPERTIES,

	MEI_HBM_STARTED,

	MEI_HBM_STOPPED,

};