From 31a4234aad50609ca43c8a286e05f08cc4dfe6fe Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Thu, 11 Apr 2013 15:56:01 -0300 Subject: [PATCH] --- yaml --- r: 367035 b: refs/heads/master c: 2b64cbd1da7a026e0779a1ba61e83ac5fcf544e7 h: refs/heads/master i: 367033: a489e3e1c7c43621617917f34c65a0545739ff52 367031: 8bbb1feb8e909c4a981590f5118641c6535a408c v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/em28xx/em28xx-cards.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 578bfc3eec3b..a343dccf0760 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c15b715ef301a7f8bb2dc8de335497ffde568a6 +refs/heads/master: 2b64cbd1da7a026e0779a1ba61e83ac5fcf544e7 diff --git a/trunk/drivers/media/usb/em28xx/em28xx-cards.c b/trunk/drivers/media/usb/em28xx/em28xx-cards.c index 1d3866f53c9b..a3c305598b4b 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/usb/em28xx/em28xx-cards.c @@ -2810,7 +2810,8 @@ static void request_module_async(struct work_struct *work) if (dev->board.has_dvb) request_module("em28xx-dvb"); - if ((dev->board.ir_codes || dev->board.has_ir_i2c) && !disable_ir) + if (dev->board.has_snapshot_button || + ((dev->board.ir_codes || dev->board.has_ir_i2c) && !disable_ir)) request_module("em28xx-rc"); #endif /* CONFIG_MODULES */ }