aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/connector/cn_queue.c1
-rw-r--r--include/linux/connector.h4
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index dbda08c7b3db..5732ca3259f9 100644
--- 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
104 return -EINVAL; 104 return -EINVAL;
105 } 105 }
106 106
107 cbq->nls = dev->nls;
108 cbq->seq = 0; 107 cbq->seq = 0;
109 cbq->group = cbq->id.id.idx; 108 cbq->group = cbq->id.id.idx;
110 109
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 7e18311d655e..da6dd957f908 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -132,15 +132,13 @@ struct cn_callback_data {
132 132
133struct cn_callback_entry { 133struct cn_callback_entry {
134 struct list_head callback_entry; 134 struct list_head callback_entry;
135 struct cn_callback *cb;
136 struct work_struct work; 135 struct work_struct work;
137 struct cn_queue_dev *pdev; 136 struct cn_queue_dev *pdev;
138 137
139 struct cn_callback_id id; 138 struct cn_callback_id id;
140 struct cn_callback_data data; 139 struct cn_callback_data data;
141 140
142 int seq, group; 141 u32 seq, group;
143 struct sock *nls;
144}; 142};
145 143
146struct cn_ctl_entry { 144struct cn_ctl_entry {