3 files changed, 15 insertions, 18 deletions

diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 3ece69231343..5c9f67f98d10 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/connector.h>
 #include <asm/atomic.h>
+#include <asm/unaligned.h>
 
 #include <linux/cn_proc.h>
 
@@ -60,7 +61,7 @@ void proc_fork_connector(struct task_struct *task)
         ev = (struct proc_event*)msg->data;
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
-        ev->timestamp_ns = timespec_to_ns(&ts);
+        put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
         ev->what = PROC_EVENT_FORK;
         ev->event_data.fork.parent_pid = task->real_parent->pid;
         ev->event_data.fork.parent_tgid = task->real_parent->tgid;
@@ -88,7 +89,7 @@ void proc_exec_connector(struct task_struct *task)
         ev = (struct proc_event*)msg->data;
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
-        ev->timestamp_ns = timespec_to_ns(&ts);
+        put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
         ev->what = PROC_EVENT_EXEC;
         ev->event_data.exec.process_pid = task->pid;
         ev->event_data.exec.process_tgid = task->tgid;
@@ -124,7 +125,7 @@ void proc_id_connector(struct task_struct *task, int which_id)
                 return;
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
-        ev->timestamp_ns = timespec_to_ns(&ts);
+        put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
 
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = 0; /* not used */
@@ -146,7 +147,7 @@ void proc_exit_connector(struct task_struct *task)
         ev = (struct proc_event*)msg->data;
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
-        ev->timestamp_ns = timespec_to_ns(&ts);
+        put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
         ev->what = PROC_EVENT_EXIT;
         ev->event_data.exit.process_pid = task->pid;
         ev->event_data.exit.process_tgid = task->tgid;
@@ -181,7 +182,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
         ev = (struct proc_event*)msg->data;
         msg->seq = rcvd_seq;
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
-        ev->timestamp_ns = timespec_to_ns(&ts);
+        put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
         ev->cpu = -1;
         ev->what = PROC_EVENT_NONE;
         ev->event_data.ack.err = err;
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index b418b16e910e..296f51002b55 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -34,7 +34,7 @@
 void cn_queue_wrapper(struct work_struct *work)
 {
         struct cn_callback_entry *cbq =
-                container_of(work, struct cn_callback_entry, work.work);
+                container_of(work, struct cn_callback_entry, work);
         struct cn_callback_data *d = &cbq->data;
 
         d->callback(d->callback_priv);
@@ -59,13 +59,12 @@ static struct cn_callback_entry *cn_queue_alloc_callback_entry(char *name, struc
         memcpy(&cbq->id.id, id, sizeof(struct cb_id));
         cbq->data.callback = callback;
         
-        INIT_DELAYED_WORK(&cbq->work, &cn_queue_wrapper);
+        INIT_WORK(&cbq->work, &cn_queue_wrapper);
         return cbq;
 }
 
 static void cn_queue_free_callback(struct cn_callback_entry *cbq)
 {
-        cancel_delayed_work(&cbq->work);
         flush_workqueue(cbq->pdev->cn_queue);
 
         kfree(cbq);
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 5e7cd45d10ee..a44db75bc25b 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -135,17 +135,15 @@ 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) &&
                                         __cbq->data.ddata == NULL)) {
                                 __cbq->data.callback_priv = msg;
 
                                 __cbq->data.ddata = data;
                                 __cbq->data.destruct_data = destruct_data;
 
-                                if (queue_delayed_work(
-                                            dev->cbdev->cn_queue,
-                                            &__cbq->work, 0))
+                                if (queue_work(dev->cbdev->cn_queue,
+                                                        &__cbq->work))
                                         err = 0;
                         } else {
                                 struct cn_callback_data *d;
@@ -159,12 +157,11 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
                                         d->destruct_data = destruct_data;
                                         d->free = __cbq;
 
-                                        INIT_DELAYED_WORK(&__cbq->work,
-                                                          &cn_queue_wrapper);
+                                        INIT_WORK(&__cbq->work,
+                                                        &cn_queue_wrapper);
                                         
-                                        if (queue_delayed_work(
-                                                    dev->cbdev->cn_queue,
-                                                    &__cbq->work, 0))
+                                        if (queue_work(dev->cbdev->cn_queue,
+                                                    &__cbq->work))
                                                 err = 0;
                                         else {
                                                 kfree(__cbq);