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

Commit 3438c1f3 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: use consistently me_addr in the hbm structures 



Use consistently me_addr name in hbm protocol structures
to represent in firmware client address

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 05e314e2

drivers/misc/mei/hbm.c

+3 −3
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static int mei_hbm_prop_req(struct mei_device *dev) 




	prop_req->hbm_cmd = HOST_CLIENT_PROPERTIES_REQ_CMD;

	prop_req->address = next_client_index;

	prop_req->me_addr = next_client_index;



	ret = mei_write_message(dev, mei_hdr, dev->wr_msg.data);

	if (ret) {
@@ -783,9 +783,9 @@ int mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr) 
			return -EPROTO;

		}



		if (me_client->client_id != props_res->address) {

		if (me_client->client_id != props_res->me_addr) {

			dev_err(&dev->pdev->dev, "hbm: properties response: address mismatch %d ?= %d\n",

				me_client->client_id, props_res->address);

				me_client->client_id, props_res->me_addr);

			return -EPROTO;

		}

drivers/misc/mei/hw.h

+2 −3
Original line number Diff line number Diff line
@@ -206,14 +206,13 @@ struct mei_client_properties { 


struct hbm_props_request {

	u8 hbm_cmd;

	u8 address;

	u8 me_addr;

	u8 reserved[2];

} __packed;





struct hbm_props_response {

	u8 hbm_cmd;

	u8 address;

	u8 me_addr;

	u8 status;

	u8 reserved[1];

	struct mei_client_properties client_properties;