Skip to content

Commit

Permalink
[CONNECTOR]: Fix compilation breakage introduced recently.
Browse files Browse the repository at this point in the history
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 99f5e97.

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>
  • Loading branch information
Evgeniy Polyakov authored and David S. Miller committed Dec 18, 2006
1 parent 749494b commit d8172d8
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/connector/connector.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit d8172d8

Please sign in to comment.