Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[pandora-kernel.git] / drivers / connector / cn_queue.c

diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index 12ceed5..b6fe7e7 100644 (file)
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -104,7 +104,6 @@ int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id
                return -EINVAL;
        }
 
-       cbq->nls = dev->nls;
        cbq->seq = 0;
        cbq->group = cbq->id.id.idx;
 
@@ -146,9 +145,8 @@ struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *nls)
        spin_lock_init(&dev->queue_lock);
 
        dev->nls = nls;
-       dev->netlink_groups = 0;
 
-       dev->cn_queue = create_workqueue(dev->name);
+       dev->cn_queue = create_singlethread_workqueue(dev->name);
        if (!dev->cn_queue) {
                kfree(dev);
                return NULL;