diff options
| author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-29 20:43:55 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:40:37 -0500 |
| commit | 62f3e69bd5ff9db1574356a84895324ab3896e44 (patch) | |
| tree | 97c55a9742decfc7c341ff815e0f7f36e25732af | |
| parent | 7ed3a7a3113a5399a4591fdf1f2a07c9cd954853 (diff) | |
V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices
Like the em2874, the em2870 does not have any analog support, so don't bother
loading the em28xx-alsa module.
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index ac735f25283c..5d1482280e45 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
| @@ -465,7 +465,7 @@ int em28xx_audio_setup(struct em28xx *dev) | |||
| 465 | int vid1, vid2, feat, cfg; | 465 | int vid1, vid2, feat, cfg; |
| 466 | u32 vid; | 466 | u32 vid; |
| 467 | 467 | ||
| 468 | if (dev->chip_id == CHIP_ID_EM2874) { | 468 | if (dev->chip_id == CHIP_ID_EM2870 || dev->chip_id == CHIP_ID_EM2874) { |
| 469 | /* Digital only device - don't load any alsa module */ | 469 | /* Digital only device - don't load any alsa module */ |
| 470 | dev->audio_mode.has_audio = 0; | 470 | dev->audio_mode.has_audio = 0; |
| 471 | dev->has_audio_class = 0; | 471 | dev->has_audio_class = 0; |