diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-03-01 19:31:53 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-03-01 19:31:53 +0100 |
| commit | 04421fe2671c1790ab6529fad87ce8c73af0e1eb (patch) | |
| tree | d2f803b4eef6108648f1beee6bf97a342cd9bc73 /drivers/misc/mei/wd.c | |
| parent | Input: imx_keypad - Propagate the real error code on platform_get_irq() failure (diff) | |
| parent | Linux 3.14-rc4 (diff) | |
| download | linux-04421fe2671c1790ab6529fad87ce8c73af0e1eb.tar.xz linux-04421fe2671c1790ab6529fad87ce8c73af0e1eb.zip | |
Merge tag 'v3.14-rc4' into next
Merge with Linux 3.14-rc4 to bring devm_request_any_context_irq().
Diffstat (limited to 'drivers/misc/mei/wd.c')
| -rw-r--r-- | drivers/misc/mei/wd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c index 9e354216c163..f70945ed96f6 100644 --- a/drivers/misc/mei/wd.c +++ b/drivers/misc/mei/wd.c @@ -115,6 +115,7 @@ int mei_wd_send(struct mei_device *dev) hdr.me_addr = dev->wd_cl.me_client_id; hdr.msg_complete = 1; hdr.reserved = 0; + hdr.internal = 0; if (!memcmp(dev->wd_data, mei_start_wd_params, MEI_WD_HDR_SIZE)) hdr.length = MEI_WD_START_MSG_SIZE; |