From f6958868bcc7f904439cf9d22538af71d00d5002 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 25 Jan 2012 23:14:56 +0900 Subject: [PATCH] --- yaml --- r: 288925 b: refs/heads/master c: 32de21f75d0152571eb3710f170cddb5db3d0336 h: refs/heads/master i: 288923: b9d928efd9efd2dc24b2b6aef47e858b326c9699 v: v3 --- [refs] | 2 +- trunk/drivers/staging/mei/interrupt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 584958953d4d..3425bedfcc3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6222d7a17745f6e48fddda7245e4bb0d58bfeaf0 +refs/heads/master: 32de21f75d0152571eb3710f170cddb5db3d0336 diff --git a/trunk/drivers/staging/mei/interrupt.c b/trunk/drivers/staging/mei/interrupt.c index 3544fee34e48..e85a85a96036 100644 --- a/trunk/drivers/staging/mei/interrupt.c +++ b/trunk/drivers/staging/mei/interrupt.c @@ -1423,7 +1423,7 @@ void mei_timer(struct work_struct *work) if (dev->iamthif_stall_timer) { if (--dev->iamthif_stall_timer == 0) { - dev_dbg(&dev->pdev->dev, "reseting because of hang to amthi.\n"); + dev_dbg(&dev->pdev->dev, "resetting because of hang to amthi.\n"); mei_reset(dev, 1); dev->iamthif_msg_buf_size = 0; dev->iamthif_msg_buf_index = 0;