diff options
| author | Ezequiel García <elezegarcia@gmail.com> | 2012-03-26 09:13:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-10 20:41:39 -0300 |
| commit | 2fd6f8d15371686e3fee87d6119cab9bc4d76349 (patch) | |
| tree | 4ecf022b24d5fdda0d915f0034bc6aded16d07aa /drivers/media/video/em28xx/em28xx-cards.c | |
| parent | 37e65dceccf1b556afc17328fbdd782693807af9 (diff) | |
| download | linux-2fd6f8d15371686e3fee87d6119cab9bc4d76349.tar.gz linux-2fd6f8d15371686e3fee87d6119cab9bc4d76349.tar.bz2 linux-2fd6f8d15371686e3fee87d6119cab9bc4d76349.zip | |
[media] em28xx: Move ir/rc related initialization to em28xx_ir_init()
Moving this helps isolating em28xx_input and will help
converting it into a separate module.
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 9fd8cc7dbb23..e3df8594ba26 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -2849,13 +2849,6 @@ void em28xx_card_setup(struct em28xx *dev) break; } -#if defined(CONFIG_MODULES) && defined(MODULE) - if (dev->board.has_ir_i2c && !disable_ir) - request_module("ir-kbd-i2c"); -#endif - if (dev->board.has_snapshot_button) - em28xx_register_snapshot_button(dev); - if (dev->board.valid == EM28XX_BOARD_NOT_VALIDATED) { em28xx_errdev("\n\n"); em28xx_errdev("The support for this board weren't " @@ -2972,9 +2965,6 @@ static void flush_request_modules(struct em28xx *dev) */ void em28xx_release_resources(struct em28xx *dev) { - if (dev->sbutton_input_dev) - em28xx_deregister_snapshot_button(dev); - if (dev->ir) em28xx_ir_fini(dev); |