Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / media / rc / ir-raw.c

diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 27808bb..3a5a5b6 100644 (file)
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -12,8 +12,10 @@
  *  GNU General Public License for more details.
  */
 
+#include <linux/export.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
+#include <linux/kmod.h>
 #include <linux/sched.h>
 #include <linux/freezer.h>
 #include "rc-core-priv.h"
@@ -223,7 +225,7 @@ void ir_raw_event_handle(struct rc_dev *dev)
 {
        unsigned long flags;
 
-       if (!dev->raw)
+       if (!dev->raw || !dev->raw->thread)
                return;
 
        spin_lock_irqsave(&dev->raw->lock, flags);
@@ -250,6 +252,7 @@ int ir_raw_event_register(struct rc_dev *dev)
 {
        int rc;
        struct ir_raw_handler *handler;
+       struct task_struct *thread;
 
        if (!dev)
                return -EINVAL;
@@ -267,14 +270,16 @@ int ir_raw_event_register(struct rc_dev *dev)
                goto out;
 
        spin_lock_init(&dev->raw->lock);
-       dev->raw->thread = kthread_run(ir_raw_event_thread, dev->raw,
-                                      "rc%ld", dev->devno);
+       thread = kthread_run(ir_raw_event_thread, dev->raw, "rc%ld",
+                            dev->devno);
 
-       if (IS_ERR(dev->raw->thread)) {
-               rc = PTR_ERR(dev->raw->thread);
+       if (IS_ERR(thread)) {
+               rc = PTR_ERR(thread);
                goto out;
        }
 
+       dev->raw->thread = thread;
+
        mutex_lock(&ir_raw_handler_lock);
        list_add_tail(&dev->raw->list, &ir_raw_client_list);
        list_for_each_entry(handler, &ir_raw_handler_list, list)