Commit 8ac1c101 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] version 1.0.14
  [ALSA] hda-codec - Fix STAC922x capture boost level
  [ALSA] hda-codec - Fix input with STAC92xx
  [ALSA] hda-codec - Fix pin configs for Gateway MX6453
  [ALSA] hda-codec - Add support for MSI K9N Ultra
  [ALSA] hda-codec - Add quirk for Supermicro PDSBA to alc883_cfg_tbl[]
  [ALSA] hda-codec - Add quirk for MSI S420
  [ALSA] Fix ASoC s3c24xx-pcm spinlock bug
  [ALSA] hda-intel: fix ASUS M2V detection
  [ALSA] ali5451 - Fix possible NULL dereference
  [ALSA] hda-codec - Add support for ASUS A8J modem
  [ALSA] HDA: Fix headphone mute issue on non-eapd Conexant systems
  [ALSA] HDA: Add more systems to Sigmatel codec
  [ALSA] HDA: Add support for Gateway NX860
parents 0e9871df 672cc6c6

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −0
Original line number Diff line number Diff line
@@ -917,6 +917,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  ref		Reference board, base config

	  m2-2		Some Gateway MX series laptops

	  m6		Some Gateway NX series laptops

	  pa6		Gateway NX860 series



	STAC9227/9228/9229/927x

	  ref		Reference board

include/sound/version.h

+2 −2
Original line number Diff line number Diff line 
/* include/version.h.  Generated by alsa/ksync script.  */

#define CONFIG_SND_VERSION "1.0.14rc4"

#define CONFIG_SND_DATE " (Wed May 16 09:45:46 2007 UTC)"
 
#define CONFIG_SND_VERSION "1.0.14"

#define CONFIG_SND_DATE " (Thu May 31 09:03:25 2007 UTC)"

sound/pci/ali5451/ali5451.c

+3 −3
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ static int snd_ali_playback_hw_params(struct snd_pcm_substream *substream, 
			evoice->substream = substream;

		}

	} else {

		if (!evoice) {

		if (evoice) {

			snd_ali_free_voice(codec, evoice);

			pvoice->extra = evoice = NULL;

		}
@@ -1267,7 +1267,7 @@ static int snd_ali_playback_hw_free(struct snd_pcm_substream *substream) 
	struct snd_ali_voice *evoice = pvoice ? pvoice->extra : NULL;



	snd_pcm_lib_free_pages(substream);

	if (!evoice) {

	if (evoice) {

		snd_ali_free_voice(codec, evoice);

		pvoice->extra = NULL;

	}
@@ -1356,7 +1356,7 @@ static int snd_ali_playback_prepare(struct snd_pcm_substream *substream) 
				 VOL,

				 CTRL,

				 EC);

	if (!evoice) {

	if (evoice) {

		evoice->count = pvoice->count;

		evoice->eso = pvoice->count << 1;

		ESO = evoice->eso - 1;

sound/pci/hda/hda_codec.c

+13 −0
Original line number Diff line number Diff line
@@ -713,6 +713,19 @@ static u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction) 
	return info->amp_caps;

}



int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,

			      unsigned int caps)

{

	struct hda_amp_info *info;



	info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, dir, 0));

	if (!info)

		return -EINVAL;

	info->amp_caps = caps;

	info->status |= INFO_AMP_CAPS;

	return 0;

}



/*

 * read the current volume to info

 * if the cache exists, read the cache value.

sound/pci/hda/hda_local.h

+2 −0
Original line number Diff line number Diff line
@@ -277,5 +277,7 @@ static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid) 
	return codec->wcaps[nid - codec->start_nid];

}



int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,

			      unsigned int caps);



#endif /* __SOUND_HDA_LOCAL_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE