aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-07-29 01:26:59 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-30 23:51:11 -0400
commit6d51477470728074cea396a0127d73c5590dd441 (patch)
tree779274c3d5c089b559bc47c902347c4949715738 /drivers/media/video/em28xx/em28xx-input.c
parentb05681b91709a19b40a452f566cc852619b30082 (diff)
[media] em28xx: Fix IR unregister logic
The input stop() callback already calls the em28xx_ir_stop method. Calling it again causes an oops. Acked-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-input.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-input.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 5d12b14282e3..679da4804281 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -463,11 +463,11 @@ int em28xx_ir_fini(struct em28xx *dev)
463 if (!ir) 463 if (!ir)
464 return 0; 464 return 0;
465 465
466 em28xx_ir_stop(ir->rc); 466 if (ir->rc)
467 rc_unregister_device(ir->rc); 467 rc_unregister_device(ir->rc);
468 kfree(ir);
469 468
470 /* done */ 469 /* done */
470 kfree(ir);
471 dev->ir = NULL; 471 dev->ir = NULL;
472 return 0; 472 return 0;
473} 473}