Commit 6f403346 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Add STAC9205 PCI_QUIRK for Dell Vostro 1700
  ASoC: Do not write to invalid registers on the wm9712.
  ALSA: hda - Set mixer name after codec patch
  ASoC: add missing parameter to mx27vis_hifi_hw_free()
  ASoC: sh: FSI:: don't check platform_get_irq's return value against zero
  ALSA: sound/core/pcm_timer.c: use lib/gcd.c
  ALSA: hda - Add MSI blacklist
  ALSA: hda - Add support for the new 27 inch IMacs
  ALSA: hda - Fix NULL dereference with enable_beep=0 option
parents 9c717de9 54a26089

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -403,4 +403,5 @@ STAC9872 
Cirrus Logic CS4206/4207

========================

  mbp55		MacBook Pro 5,5

  imac27	IMac 27 Inch

  auto		BIOS setup (default)

sound/core/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config SND_TIMER 
config SND_PCM

	tristate

	select SND_TIMER

	select GCD



config SND_HWDEP

	tristate

sound/core/pcm_timer.c

+1 −16
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 */



#include <linux/time.h>

#include <linux/gcd.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/timer.h>
@@ -28,22 +29,6 @@ 
 *  Timer functions

 */



/* Greatest common divisor */

static unsigned long gcd(unsigned long a, unsigned long b)

{

	unsigned long r;

	if (a < b) {

		r = a;

		a = b;

		b = r;

	}

	while ((r = a % b) != 0) {

		a = b;

		b = r;

	}

	return b;

}



void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream)

{

	unsigned long rate, mult, fsize, l, post;

sound/pci/hda/hda_codec.c

+5 −5
Original line number Diff line number Diff line
@@ -1086,11 +1086,6 @@ int snd_hda_codec_configure(struct hda_codec *codec) 
		if (err < 0)

			return err;

	}

	/* audio codec should override the mixer name */

	if (codec->afg || !*codec->bus->card->mixername)

		snprintf(codec->bus->card->mixername,

			 sizeof(codec->bus->card->mixername),

			 "%s %s", codec->vendor_name, codec->chip_name);



	if (is_generic_config(codec)) {

		err = snd_hda_parse_generic_codec(codec);
@@ -1109,6 +1104,11 @@ int snd_hda_codec_configure(struct hda_codec *codec) 
 patched:

	if (!err && codec->patch_ops.unsol_event)

		err = init_unsol_queue(codec->bus);

	/* audio codec should override the mixer name */

	if (!err && (codec->afg || !*codec->bus->card->mixername))

		snprintf(codec->bus->card->mixername,

			 sizeof(codec->bus->card->mixername),

			 "%s %s", codec->vendor_name, codec->chip_name);

	return err;

}

EXPORT_SYMBOL_HDA(snd_hda_codec_configure);

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2322,6 +2322,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev) 
 * white/black-list for enable_msi

 */

static struct snd_pci_quirk msi_black_list[] __devinitdata = {

	SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE