From eb9ddaabce7ec292fd9081b622e68c65740428e4 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sat, 28 Jan 2012 21:41:52 -0300 Subject: [PATCH] --- yaml --- r: 294895 b: refs/heads/master c: c659395935d6ad8781fe9958ed1a9dbe969b3a17 h: refs/heads/master i: 294893: d7133067d82f0a669ada7619bb49960438fa10b9 294891: 184c6b587f683383afa379beb6b3efcaf77be4dc 294887: 5f4a12855f8e5254812020616deaf87a811f58a0 294879: 24bd92b0c952ae1ff1c39fe926efd268f53e2459 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tm6000/tm6000-input.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2b954cc22a4c..8d314d1dbe86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc594e3e5196d4cf7ace7735eeca399f7a80868b +refs/heads/master: c659395935d6ad8781fe9958ed1a9dbe969b3a17 diff --git a/trunk/drivers/media/video/tm6000/tm6000-input.c b/trunk/drivers/media/video/tm6000/tm6000-input.c index 7844607dd45a..859eb90e4d56 100644 --- a/trunk/drivers/media/video/tm6000/tm6000-input.c +++ b/trunk/drivers/media/video/tm6000/tm6000-input.c @@ -481,8 +481,6 @@ int tm6000_ir_fini(struct tm6000_core *dev) dprintk(2, "%s\n",__func__); - rc_unregister_device(ir->rc); - if (!ir->polling) __tm6000_ir_int_stop(ir->rc); @@ -492,6 +490,7 @@ int tm6000_ir_fini(struct tm6000_core *dev) tm6000_flash_led(dev, 0); ir->pwled = 0; + rc_unregister_device(ir->rc); kfree(ir); dev->ir = NULL;