diff options
Diffstat (limited to 'drivers/misc/mei/amthif.c')
-rw-r--r-- | drivers/misc/mei/amthif.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index d22c6864508b..2fad84432829 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c | |||
@@ -177,7 +177,7 @@ int mei_amthif_read(struct mei_device *dev, struct file *file, | |||
177 | unsigned long timeout; | 177 | unsigned long timeout; |
178 | int i; | 178 | int i; |
179 | 179 | ||
180 | /* Only Posible if we are in timeout */ | 180 | /* Only possible if we are in timeout */ |
181 | if (!cl || cl != &dev->iamthif_cl) { | 181 | if (!cl || cl != &dev->iamthif_cl) { |
182 | dev_dbg(&dev->pdev->dev, "bad file ext.\n"); | 182 | dev_dbg(&dev->pdev->dev, "bad file ext.\n"); |
183 | return -ETIMEDOUT; | 183 | return -ETIMEDOUT; |
@@ -249,7 +249,7 @@ int mei_amthif_read(struct mei_device *dev, struct file *file, | |||
249 | cb->response_buffer.size); | 249 | cb->response_buffer.size); |
250 | dev_dbg(&dev->pdev->dev, "amthif cb->buf_idx - %lu\n", cb->buf_idx); | 250 | dev_dbg(&dev->pdev->dev, "amthif cb->buf_idx - %lu\n", cb->buf_idx); |
251 | 251 | ||
252 | /* length is being turncated to PAGE_SIZE, however, | 252 | /* length is being truncated to PAGE_SIZE, however, |
253 | * the buf_idx may point beyond */ | 253 | * the buf_idx may point beyond */ |
254 | length = min_t(size_t, length, (cb->buf_idx - *offset)); | 254 | length = min_t(size_t, length, (cb->buf_idx - *offset)); |
255 | 255 | ||
@@ -316,6 +316,7 @@ static int mei_amthif_send_cmd(struct mei_device *dev, struct mei_cl_cb *cb) | |||
316 | mei_hdr.host_addr = dev->iamthif_cl.host_client_id; | 316 | mei_hdr.host_addr = dev->iamthif_cl.host_client_id; |
317 | mei_hdr.me_addr = dev->iamthif_cl.me_client_id; | 317 | mei_hdr.me_addr = dev->iamthif_cl.me_client_id; |
318 | mei_hdr.reserved = 0; | 318 | mei_hdr.reserved = 0; |
319 | mei_hdr.internal = 0; | ||
319 | dev->iamthif_msg_buf_index += mei_hdr.length; | 320 | dev->iamthif_msg_buf_index += mei_hdr.length; |
320 | ret = mei_write_message(dev, &mei_hdr, dev->iamthif_msg_buf); | 321 | ret = mei_write_message(dev, &mei_hdr, dev->iamthif_msg_buf); |
321 | if (ret) | 322 | if (ret) |
@@ -477,6 +478,7 @@ int mei_amthif_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb, | |||
477 | mei_hdr.host_addr = cl->host_client_id; | 478 | mei_hdr.host_addr = cl->host_client_id; |
478 | mei_hdr.me_addr = cl->me_client_id; | 479 | mei_hdr.me_addr = cl->me_client_id; |
479 | mei_hdr.reserved = 0; | 480 | mei_hdr.reserved = 0; |
481 | mei_hdr.internal = 0; | ||
480 | 482 | ||
481 | if (*slots >= msg_slots) { | 483 | if (*slots >= msg_slots) { |
482 | mei_hdr.length = len; | 484 | mei_hdr.length = len; |