V4L/DVB (13397): firedtv: move remote control workqueue handling into rc source file

Preparation for the port of firedtv to the firewire-core kernel API:
Canceling of the remote control workqueue job is factored into
firedtv-rc.c.  Plus trivial whitespace change.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/firewire/firedtv-1394.c b/drivers/media/dvb/firewire/firedtv-1394.c
index 2b6eeeab5b257ff2e2469afb8f0587da98a4ea0f..a2e3841f8ee92c3b05e94ee82cc50e5cfc2b4f61 100644 (file)
--- a/drivers/media/dvb/firewire/firedtv-1394.c
+++ b/drivers/media/dvb/firewire/firedtv-1394.c
@@ -212,6 +212,7 @@ static int node_probe(struct device *dev)
                goto fail;
 
        avc_register_remote_control(fdtv);
+
        return 0;
 fail:
        spin_lock_irq(&node_list_lock);
@@ -220,6 +221,7 @@ fail:
        fdtv_unregister_rc(fdtv);
 fail_free:
        kfree(fdtv);
+
        return err;
 }
 
@@ -233,10 +235,9 @@ static int node_remove(struct device *dev)
        list_del(&fdtv->list);
        spin_unlock_irq(&node_list_lock);
 
-       cancel_work_sync(&fdtv->remote_ctrl_work);
        fdtv_unregister_rc(fdtv);
-
        kfree(fdtv);
+
        return 0;
 }
 

diff --git a/drivers/media/dvb/firewire/firedtv-rc.c b/drivers/media/dvb/firewire/firedtv-rc.c
index 27bca2e283dfc4a0a00ea070da033788997b27df..599d66e5843dcd51668077ad7404618336d10ae5 100644 (file)
--- a/drivers/media/dvb/firewire/firedtv-rc.c
+++ b/drivers/media/dvb/firewire/firedtv-rc.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/workqueue.h>
 
 #include "firedtv.h"
 
@@ -163,6 +164,7 @@ fail:
 
 void fdtv_unregister_rc(struct firedtv *fdtv)
 {
+       cancel_work_sync(&fdtv->remote_ctrl_work);
        kfree(fdtv->remote_ctrl_dev->keycode);
        input_unregister_device(fdtv->remote_ctrl_dev);
 }