From 4a40dbd42e3d827aa3d32bf0d114e1ee5e21f2b2 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 6 Jan 2008 09:54:17 -0300
Subject: [PATCH] --- yaml --- r: 76703 b: refs/heads/master c:
 3f4dfe2acf4ffed48395e69166531d8925eb106a h: refs/heads/master i:   76701:
 898c38caabed1328ece6740340a1984563d22119   76699:
 e36e2ba8b560556909fd6f8c410219d008f55be7   76695:
 53b280398d515b69750296fd7843d9ce702d3b57   76687:
 9d3e5499e390aa32317b5e548b5c2bfefe3b1481   76671:
 fa98c8fb51b4fe0b16f1c488736b7d1244dc226d v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-video.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4d8d0286db31..32dae71d4b35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4950134d46f0b83745f05ea37987785a3905eba
+refs/heads/master: 3f4dfe2acf4ffed48395e69166531d8925eb106a
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index 5a90462d82e5..de95ca874241 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/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");
 }