Commit 656829e2 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.14rc1
  [ALSA] usbaudio - Fix kobject_add() error at reconnection
  [ALSA] usb: usbmixer error path fix
  [ALSA] _snd_cmipci_uswitch_put doesn't set zero flags
  [ALSA] hda-codec - Fix NULL dereference in generic hda code
  [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH9
  [ALSA] usb-audio: work around wrong frequency in CM6501 descriptors
  [ALSA] Fix potential NULL pointer dereference in echoaudio midi
  [ALSA] Audio: Add nvidia HD Audio controllers of MCP67 support to hda_intel.c
parents 76a2f047 a037b0a4

include/sound/version.h

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

#define CONFIG_SND_VERSION "1.0.14rc1"

#define CONFIG_SND_DATE " (Wed Dec 20 08:11:48 2006 UTC)"
 
#define CONFIG_SND_DATE " (Tue Jan 09 09:56:17 2007 UTC)"

sound/pci/cmipci.c

+2 −1
Original line number Diff line number Diff line
@@ -2198,7 +2198,8 @@ static int _snd_cmipci_uswitch_put(struct snd_kcontrol *kcontrol, 
		val = inb(cm->iobase + args->reg);

	else

		val = snd_cmipci_read(cm, args->reg);

	change = (val & args->mask) != (ucontrol->value.integer.value[0] ? args->mask : 0);

	change = (val & args->mask) != (ucontrol->value.integer.value[0] ? 

			args->mask_on : (args->mask & ~args->mask_on));

	if (change) {

		val &= ~args->mask;

		if (ucontrol->value.integer.value[0])

sound/pci/echoaudio/midi.c

+4 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static void snd_echo_midi_output_write(unsigned long data) 
	sent = bytes = 0;

	spin_lock_irqsave(&chip->lock, flags);

	chip->midi_full = 0;

	if (chip->midi_out && !snd_rawmidi_transmit_empty(chip->midi_out)) {

	if (!snd_rawmidi_transmit_empty(chip->midi_out)) {

		bytes = snd_rawmidi_transmit_peek(chip->midi_out, buf,

						  MIDI_OUT_BUFFER_SIZE - 1);

		DE_MID(("Try to send %d bytes...\n", bytes));
@@ -264,9 +264,11 @@ static void snd_echo_midi_output_trigger(struct snd_rawmidi_substream *substream 
		}

	} else {

		if (chip->tinuse) {

			del_timer(&chip->timer);

			chip->tinuse = 0;

			spin_unlock_irq(&chip->lock);

			del_timer_sync(&chip->timer);

			DE_MID(("Timer removed\n"));

			return;

		}

	}

	spin_unlock_irq(&chip->lock);

sound/pci/hda/hda_generic.c

+3 −2
Original line number Diff line number Diff line
@@ -485,8 +485,9 @@ static const char *get_input_type(struct hda_gnode *node, unsigned int *pinctl) 
			return "Front Aux";

		return "Aux";

	case AC_JACK_MIC_IN:

		if (node->pin_caps &

		    (AC_PINCAP_VREF_80 << AC_PINCAP_VREF_SHIFT))

		if (pinctl &&

		    (node->pin_caps &

		     (AC_PINCAP_VREF_80 << AC_PINCAP_VREF_SHIFT)))

			*pinctl |= AC_PINCTL_VREF_80;

		if ((location & 0x0f) == AC_JACK_LOC_FRONT)

			return "Front Mic";

sound/pci/hda/hda_intel.c

+11 −3
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6}," 
			 "{Intel, ICH7},"

			 "{Intel, ESB2},"

			 "{Intel, ICH8},"

			 "{Intel, ICH9},"

			 "{ATI, SB450},"

			 "{ATI, SB600},"

			 "{ATI, RS600},"
@@ -1711,6 +1712,8 @@ static struct pci_device_id azx_ids[] = { 
	{ 0x8086, 0x27d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH7 */

	{ 0x8086, 0x269a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ESB2 */

	{ 0x8086, 0x284b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH8 */

	{ 0x8086, 0x293e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH9 */

	{ 0x8086, 0x293f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH9 */

	{ 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */

	{ 0x1002, 0x4383, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB600 */

	{ 0x1002, 0x793b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RS600 HDMI */
@@ -1718,9 +1721,14 @@ static struct pci_device_id azx_ids[] = { 
	{ 0x1106, 0x3288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_VIA }, /* VIA VT8251/VT8237A */

	{ 0x1039, 0x7502, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_SIS }, /* SIS966 */

	{ 0x10b9, 0x5461, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ULI }, /* ULI M5461 */

	{ 0x10de, 0x026c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 026c */

	{ 0x10de, 0x0371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 0371 */

	{ 0x10de, 0x03f0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 03f0 */

	{ 0x10de, 0x026c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP51 */

	{ 0x10de, 0x0371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP55 */

	{ 0x10de, 0x03e4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP61 */

	{ 0x10de, 0x03f0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP61 */

	{ 0x10de, 0x044a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP65 */

	{ 0x10de, 0x044b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP65 */

	{ 0x10de, 0x055c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP67 */

	{ 0x10de, 0x055d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP67 */

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, azx_ids);

CRA Git | Maintained and supported by SUSTech CRA and CCSE