[CONNECTOR]: Fix compilation breakage introduced recently.
authorEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Mon, 18 Dec 2006 01:09:41 +0000 (17:09 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 18 Dec 2006 05:59:24 +0000 (21:59 -0800)
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 <johnpol@2ka.mipt.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/connector/connector.c

index 5e7cd45d10eec4e97a28469d9a9e41512a5d0228..4cec1a82fd43ad45ee28e94e40b49cbe4b9456e3 100644 (file)
@@ -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;