Commit e24ca925 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "mei: Avoid the use of one-element arrays" 



This reverts commit 3c3b7dde, as it
turns out Tomas made a better series of patches for this same issue.

Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 20f7151d

drivers/misc/mei/hbm.c

+2 −2
Original line number Diff line number Diff line
@@ -408,14 +408,14 @@ static int mei_hbm_add_cl_resp(struct mei_device *dev, u8 addr, u8 status) 
{

	struct mei_msg_hdr mei_hdr;

	struct hbm_add_client_response resp;

	const size_t len = sizeof(resp);

	const size_t len = sizeof(struct hbm_add_client_response);

	int ret;



	dev_dbg(dev->dev, "adding client response\n");



	mei_hbm_hdr(&mei_hdr, len);



	memset(&resp, 0, len);

	memset(&resp, 0, sizeof(struct hbm_add_client_response));

	resp.hbm_cmd = MEI_HBM_ADD_CLIENT_RES_CMD;

	resp.me_addr = addr;

	resp.status  = status;

drivers/misc/mei/hw.h

+3 −3
Original line number Diff line number Diff line
@@ -346,13 +346,13 @@ struct hbm_add_client_request { 
 * @hbm_cmd: bus message command header

 * @me_addr: address of the client in ME

 * @status: if HBMS_SUCCESS then the client can now accept connections.

 * @reserved: reserved for alignment.

 * @reserved: reserved

 */

struct hbm_add_client_response {

	u8 hbm_cmd;

	u8 me_addr;

	u8 status;

	u8 reserved;

	u8 reserved[1];

} __packed;



/**
@@ -461,7 +461,7 @@ struct hbm_notification { 
	u8 hbm_cmd;

	u8 me_addr;

	u8 host_addr;

	u8 reserved;

	u8 reserved[1];

} __packed;



/**