From 9e484638a9701556cbb2b5f3bfce137754bc4544 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Thu, 1 Nov 2012 21:17:16 +0200 Subject: [PATCH] --- yaml --- r: 336957 b: refs/heads/master c: 15ea19105bdeef36820ade6754b9b7f1e3511e98 h: refs/heads/master i: 336955: f91330a23d5c7a1abe3eaf958901863084f7e229 v: v3 --- [refs] | 2 +- trunk/drivers/misc/mei/main.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bee3f54650f8..eedc134f3eb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19838fb85306905a373b6449c1428791d653fc21 +refs/heads/master: 15ea19105bdeef36820ade6754b9b7f1e3511e98 diff --git a/trunk/drivers/misc/mei/main.c b/trunk/drivers/misc/mei/main.c index f69e0856f982..d8221a5a7ee8 100644 --- a/trunk/drivers/misc/mei/main.c +++ b/trunk/drivers/misc/mei/main.c @@ -103,18 +103,16 @@ static DEFINE_MUTEX(mei_mutex); * returns true if callback removed from the list, false otherwise */ static bool mei_clear_list(struct mei_device *dev, - struct file *file, struct list_head *mei_cb_list) + const struct file *file, struct list_head *mei_cb_list) { struct mei_cl_cb *cb_pos = NULL; struct mei_cl_cb *cb_next = NULL; - struct file *file_temp; bool removed = false; /* list all list member */ list_for_each_entry_safe(cb_pos, cb_next, mei_cb_list, list) { - file_temp = (struct file *)cb_pos->file_object; /* check if list member associated with a file */ - if (file_temp == file) { + if (file == cb_pos->file_object) { /* remove member from the list */ list_del(&cb_pos->list); /* check if cb equal to current iamthif cb */