Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d8172d822fb02d5c4f7508e41f9267428dd3d891
Commit:     d8172d822fb02d5c4f7508e41f9267428dd3d891
Parent:     749494bad9ca170e404b8dcebe8422df0d79b3ac
Author:     Evgeniy Polyakov <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 17:09:41 2006 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 21:59:24 2006 -0800

    [CONNECTOR]: Fix compilation breakage introduced recently.
    
    Linus has changed work queue structure and has not tested it with
    connector compiled in, his changes break the build.
    
    Attached patch fixes compilation error.
    
    Patch is against commit 99f5e9718185f07458ae70c2282c2153a2256c91.
    
    Thanks to Toralf Förster for pointing this out.
    
    Signed-off-by: Evgeniy Polyakov <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 drivers/connector/connector.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 5e7cd45..4cec1a8 100644
--- a/drivers/connector/connector.c
+++ b/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;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to