summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/firewire/firedtv-rc.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2009-11-08 18:28:45 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 18:41:41 -0200
commit56411f49f69140b97e259256b99dc276f2b2b427 (patch)
tree04b8c84ca48e71f36fed5cae293d3b70e5e28b58 /drivers/media/dvb/firewire/firedtv-rc.c
parentb921d929f4a012be3e809fbb1ff1e8e6c0751c06 (diff)
downloadkernel-crypto-56411f49f69140b97e259256b99dc276f2b2b427.tar.gz
kernel-crypto-56411f49f69140b97e259256b99dc276f2b2b427.tar.xz
kernel-crypto-56411f49f69140b97e259256b99dc276f2b2b427.zip
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>
Diffstat (limited to 'drivers/media/dvb/firewire/firedtv-rc.c')
-rw-r--r--drivers/media/dvb/firewire/firedtv-rc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/dvb/firewire/firedtv-rc.c b/drivers/media/dvb/firewire/firedtv-rc.c
index 27bca2e283d..599d66e5843 100644
--- 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);
}