From bde2062cc5eee0457ce4634a1cc354480fe98c16 Mon Sep 17 00:00:00 2001 From: Evgeniy Polyakov Date: Sun, 17 Dec 2006 17:09:41 -0800 Subject: [PATCH] --- yaml --- r: 44668 b: refs/heads/master c: d8172d822fb02d5c4f7508e41f9267428dd3d891 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/connector/connector.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 28d34e4e2577..e3474430b98e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 749494bad9ca170e404b8dcebe8422df0d79b3ac +refs/heads/master: d8172d822fb02d5c4f7508e41f9267428dd3d891 diff --git a/trunk/drivers/connector/connector.c b/trunk/drivers/connector/connector.c index 5e7cd45d10ee..4cec1a82fd43 100644 --- a/trunk/drivers/connector/connector.c +++ b/trunk/drivers/connector/connector.c @@ -135,8 +135,7 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v spin_lock_bh(&dev->cbdev->queue_lock); list_for_each_entry(__cbq, &dev->cbdev->queue_list, callback_entry) { if (cn_cb_equal(&__cbq->id.id, &msg->id)) { - if (likely(!test_bit(WORK_STRUCT_PENDING, - &__cbq->work.work.management) && + if (likely(!work_pending(&__cbq->work.work) && __cbq->data.ddata == NULL)) { __cbq->data.callback_priv = msg;