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"); }