ALSA fixes
Subsystems (2)
Linus,
please pull ALSA updates for 2.6.28-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
This contains one trivial fix for sound_core.c and a few (yet again) fixes for Dell laptops with STAC/IDT codecs.
Thanks!
Takashi
===
Hannes Eder (1):
sound/sound_core: Fix sparse warnings
Matthew Ranostay (2):
ALSA: hda: STAC_DELL_M6 EAPD
ALSA: hda: Add STAC_DELL_M4_3 quirk
Takashi Iwai (1):
ALSA: hda - Add a quirk for Dell Studio 15
--- Documentation/sound/alsa/ALSA-Configuration.txt | 1 + sound/pci/hda/patch_sigmatel.c | 43 +++++++++++++++++++--- sound/sound_core.c | 6 ++-- 3 files changed, 41 insertions(+), 9 deletions(-)
Documentation/sound/alsa/ALSA-Configuration.txt +1 -0
@@ -1072,6 +1072,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. ref Reference board dell-m4-1 Dell desktops dell-m4-2 Dell desktops + dell-m4-3 Dell desktops STAC92HD73* ref Reference board
sound/pci/hda/patch_sigmatel.c +37 -6
136 lines not on this page · raw message
sound/sound_core.c +3 -3
@@ -457,7 +457,7 @@ EXPORT_SYMBOL(unregister_sound_mixer);void unregister_sound_midi (int unit) { -return sound_remove_unit (&chains[2 ], unit); +sound_remove_unit (&chains[2 ], unit); }EXPORT_SYMBOL (unregister_sound_midi);
@@ -474,7 +474,7 @@ EXPORT_SYMBOL(unregister_sound_midi);void unregister_sound_dsp (int unit) { -return sound_remove_unit (&chains[3 ], unit); +sound_remove_unit (&chains[3 ], unit); }
@@ -507,7 +507,7 @@ static struct sound_unit *__look_for_unit(int chain, int unit)return NULL ; } -int soundcore_open (struct inode *inode,struct file *file) +static int soundcore_open (struct inode *inode,struct file *file) {int chain;int unit =iminor (inode);
[GIT PULL] ALSA fixes #2
Linus,
please pull the second ALSA updates for 2.6.28-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
This contains the following regression fixes in addition to the previous pull request.
It gets bigger and more complex than usual at this late stage, but all changes are pretty local and specific to certain hardwares, and fairly safe to apply.
Thanks!
Takashi
===
Takashi Iwai (5):
ALSA: hda - Fix caching of SPDIF status bits
ALSA: hda - Fix AFG power management on IDT 92HD* codecs
ALSA: hda - No 'Headphone as Line-out' swich without line-outs
ALSA: hda - mark Dell studio 1535 quirk
ALSA: hda - Check model for Dell 92HD73xx laptops
--- Documentation/sound/alsa/ALSA-Configuration.txt | 4 +- sound/pci/hda/hda_codec.c | 4 +- sound/pci/hda/patch_sigmatel.c | 129 ++++++++++++++--------- 3 files changed, 86 insertions(+), 51 deletions(-)
Documentation/sound/alsa/ALSA-Configuration.txt +3 -1
@@ -1076,7 +1076,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. STAC92HD73* ref Reference board - dell-m6 Dell desktops + dell-m6-amic Dell desktops/laptops with analog mics + dell-m6-dmic Dell desktops/laptops with digital mics + dell-m6 Dell desktops/laptops with both type of mics STAC9872 vaio Setup for VAIO FE550G/SZ110
sound/pci/hda/hda_codec.c +2 -2
@@ -1436,12 +1436,12 @@ static void set_dig_out(struct hda_codec *codec, hda_nid_t nid, {hda_nid_t *d; -snd_hda_codec_write (codec, nid,0 , verb, val); +snd_hda_codec_write_cache (codec, nid,0 , verb, val); d = codec->slave_dig_outs;if (!d)return ;for (; *d; d++) -snd_hda_codec_write (codec, *d,0 , verb, val); +snd_hda_codec_write_cache (codec, *d,0 , verb, val); } static inline void set_dig_out_convert(struct hda_codec *codec, hda_nid_t nid,
sound/pci/hda/patch_sigmatel.c +81 -48
242 lines not on this page · raw message