aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-01-06 09:54:17 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:04:39 -0200
commit3f4dfe2acf4ffed48395e69166531d8925eb106a (patch)
tree2dd07663d8a3ce777a39ea2403d4f741ea39daa1 /drivers/media
parenta4950134d46f0b83745f05ea37987785a3905eba (diff)
V4L/DVB (6970): Request snd-usb-audio for devices with Audio Class support
Before this patch, only Vendor Class audio support were loaded. This means that older em28xx devices won't have digital audio support loaded. This patch changes the logic to auto load eighter snd-usb-audio, for devices with USB Audio Class or em28xx-alsa, for devices with USB Vendor Class. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 5a90462d82e..de95ca87424 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1979,7 +1979,9 @@ static void request_module_async(struct work_struct *work)
struct em28xx *dev = container_of(work,
struct em28xx, request_module_wk);
- if (!dev->has_audio_class)
+ if (dev->has_audio_class)
+ request_module("snd-usb-audio");
+ else
request_module("em28xx-alsa");
}