diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 09:18:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 09:18:11 +0200 |
| commit | 43a3beb6da994549ec28a9f31727b997a025f958 (patch) | |
| tree | 9fea6f7e2abd5ba7ce4d5f725a8ceed0a4e0ab80 /drivers/staging/mei/interface.c | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
| parent | 68cf162a1af23c35db8e3b78659c99196c9882ff (diff) | |
Merge branch 'staging-next' into Linux 3.1
This was done to resolve a conflict in the
drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
bugfix in Linus's tree with a "better" bugfix that was in the
staging-next tree that resolved the issue in a more complete manner.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/mei/interface.c')
| -rw-r--r-- | drivers/staging/mei/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/mei/interface.c b/drivers/staging/mei/interface.c index cfec92dfc1c..a65dacf0021 100644 --- a/drivers/staging/mei/interface.c +++ b/drivers/staging/mei/interface.c @@ -332,7 +332,7 @@ int mei_send_flow_control(struct mei_device *dev, struct mei_cl *cl) mei_hdr->reserved = 0; mei_flow_control = (struct hbm_flow_control *) &dev->wr_msg_buf[1]; - memset(mei_flow_control, 0, sizeof(mei_flow_control)); + memset(mei_flow_control, 0, sizeof(*mei_flow_control)); mei_flow_control->host_addr = cl->host_client_id; mei_flow_control->me_addr = cl->me_client_id; mei_flow_control->cmd.cmd = MEI_FLOW_CONTROL_CMD; @@ -396,7 +396,7 @@ int mei_disconnect(struct mei_device *dev, struct mei_cl *cl) mei_cli_disconnect = (struct hbm_client_disconnect_request *) &dev->wr_msg_buf[1]; - memset(mei_cli_disconnect, 0, sizeof(mei_cli_disconnect)); + memset(mei_cli_disconnect, 0, sizeof(*mei_cli_disconnect)); mei_cli_disconnect->host_addr = cl->host_client_id; mei_cli_disconnect->me_addr = cl->me_client_id; mei_cli_disconnect->cmd.cmd = CLIENT_DISCONNECT_REQ_CMD; |