Skip to contentSkip to conversation

sound fixes

GIT PULL Takashi Iwai 1 participant 1 message Jan 18, 2010 Sound

lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound fixes for v2.6.33-rc5 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus

In addition to usual a few HD-audio fixes, changes of module_init() to subsys_initcall() are applied for the messy dependency between the sound subsystem and platform driver like thinkpad-acpi.

Thanks!

Takashi

===

Alex Murray (1):
ALSA: hda - Improved MacBook (Pro) 5,1 / 5,2 support

Kunal Gangakhedkar (1):
ALSA: hda - Fix mute led GPIO on HP dv-series notebooks

Takashi Iwai (4):
ALSA: hda - Fix Toshiba NB20x quirk entry
ALSA: hda - Fix missing capture mixer for ALC861/660 codecs
ALSA: hda - Fix capture on Sony VAIO with single input
ALSA: Remove warning message for invalid OSS minor ranges

Thadeu Lima de Souza Cascardo (1):
ALSA: use subsys_initcall for sound core instead of module_init

---
 sound/core/sound.c             |    4 +-
 sound/core/sound_oss.c         |    2 +-
 sound/pci/hda/patch_realtek.c  |   94 +++++++++++++++++++++++++++++++++++-----
 sound/pci/hda/patch_sigmatel.c |   61 +++++++++++++++++++-------
 sound/sound_core.c             |    2 +-
 5 files changed, 132 insertions(+), 31 deletions(-)
sound/core/sound.c +2 -2
index 7872a02..563d196 100644
@@ -468,5 +468,5 @@ static void __exit alsa_sound_exit(void)
 	unregister_chrdev(major, "alsa");
 }
 
-module_init(alsa_sound_init)
-module_exit(alsa_sound_exit)
+subsys_initcall(alsa_sound_init);
+module_exit(alsa_sound_exit);
sound/core/sound_oss.c +1 -1
index 7fe1226..0c164e5 100644
@@ -93,7 +93,7 @@ static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)
 	default:
 		return -EINVAL;
 	}
-	if (snd_BUG_ON(minor < 0 || minor >= SNDRV_OSS_MINORS))
+	if (minor < 0 || minor >= SNDRV_OSS_MINORS)
 		return -EINVAL;
 	return minor;
 }
sound/pci/hda/patch_realtek.c +83 -11

155 lines not on this page · raw message

sound/pci/hda/patch_sigmatel.c +45 -16

91 lines not on this page · raw message

sound/sound_core.c +1 -1
index dbca7c9..7c2d677 100644
@@ -61,7 +61,7 @@ static void __exit cleanup_soundcore(void)
 	class_destroy(sound_class);
 }
 
-module_init(init_soundcore);
+subsys_initcall(init_soundcore);
 module_exit(cleanup_soundcore);