aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/interrupt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/mei/interrupt.c')
-rw-r--r--drivers/misc/mei/interrupt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 5c65bac2fdec..248f581bde31 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -269,7 +269,7 @@ static int _mei_irq_thread_iamthif_read(struct mei_device *dev, s32 *slots)
269 dev->iamthif_flow_control_pending = false; 269 dev->iamthif_flow_control_pending = false;
270 dev->iamthif_msg_buf_index = 0; 270 dev->iamthif_msg_buf_index = 0;
271 dev->iamthif_msg_buf_size = 0; 271 dev->iamthif_msg_buf_size = 0;
272 dev->iamthif_stall_timer = IAMTHIF_STALL_TIMER; 272 dev->iamthif_stall_timer = MEI_IAMTHIF_STALL_TIMER;
273 dev->mei_host_buffer_is_empty = mei_hbuf_is_empty(dev); 273 dev->mei_host_buffer_is_empty = mei_hbuf_is_empty(dev);
274 return 0; 274 return 0;
275} 275}
@@ -1379,7 +1379,7 @@ void mei_timer(struct work_struct *work)
1379 if (dev->iamthif_timer) { 1379 if (dev->iamthif_timer) {
1380 1380
1381 timeout = dev->iamthif_timer + 1381 timeout = dev->iamthif_timer +
1382 msecs_to_jiffies(IAMTHIF_READ_TIMER); 1382 mei_secs_to_jiffies(MEI_IAMTHIF_READ_TIMER);
1383 1383
1384 dev_dbg(&dev->pdev->dev, "dev->iamthif_timer = %ld\n", 1384 dev_dbg(&dev->pdev->dev, "dev->iamthif_timer = %ld\n",
1385 dev->iamthif_timer); 1385 dev->iamthif_timer);