Commit d8172d82 authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by David S. Miller

[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 99f5e971.

Thanks to Toralf Förster for pointing this out.
Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 749494ba
...@@ -135,8 +135,7 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v ...@@ -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); spin_lock_bh(&dev->cbdev->queue_lock);
list_for_each_entry(__cbq, &dev->cbdev->queue_list, callback_entry) { list_for_each_entry(__cbq, &dev->cbdev->queue_list, callback_entry) {
if (cn_cb_equal(&__cbq->id.id, &msg->id)) { if (cn_cb_equal(&__cbq->id.id, &msg->id)) {
if (likely(!test_bit(WORK_STRUCT_PENDING, if (likely(!work_pending(&__cbq->work.work) &&
&__cbq->work.work.management) &&
__cbq->data.ddata == NULL)) { __cbq->data.ddata == NULL)) {
__cbq->data.callback_priv = msg; __cbq->data.callback_priv = msg;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment