Commit 95d17b71 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 - Fix no NID error with VIA codecs
  ALSA: isight: adjust for new queueing API
  ALSA: 6fire - Fix signedness bug
  ALSA: lola - Fix section mismatch
  ALSA: hda - Fix missing static inline to beep dummy function
  ALSA: 6fire: Fix double-free bug in usb6fire_fw_ezusb_upload()
  ALSA: hda - Fix beep_device compilation warnings
  ALSA: hda - Fix wrong auto-mute type for Acer Aspire-one
  ALSA: emu10k1: Add details for E-mu 0404 PCIe version
  ALSA: hdspm - Add firmware revision ID for RME MADI PCI version
  ALSA: hdspm - Fix jumping external wordclock frequency in AutoSync mode
  ALSA: hdspm - Fix locking in snd_hdspm_midi_input_read
parents 01eff85b ad240941

sound/firewire/isight.c

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static void isight_packet(struct fw_iso_context *context, u32 cycle, 
		isight->packet_index = -1;

		return;

	}

	fw_iso_context_queue_flush(isight->context);



	if (++index >= QUEUE_LENGTH)

		index = 0;

sound/pci/emu10k1/emu10k1_main.c

+8 −0
Original line number Diff line number Diff line
@@ -1440,6 +1440,14 @@ static struct snd_emu_chip_details emu_chip_details[] = { 
	 .ca0102_chip = 1,

	 .spk71 = 1,

	 .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */

	/* EMU0404 PCIe */

	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,

	 .driver = "Audigy2", .name = "E-mu 0404 PCIe [MAEM8984]",

	 .id = "EMU0404",

	 .emu10k2_chip = 1,

	 .ca0108_chip = 1,

	 .spk71 = 1,

	 .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 PCIe ver_03 */

	/* Note that all E-mu cards require kernel 2.6 or newer. */

	{.vendor = 0x1102, .device = 0x0008,

	 .driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",

sound/pci/hda/hda_beep.h

+7 −2
Original line number Diff line number Diff line
@@ -50,7 +50,12 @@ int snd_hda_enable_beep_device(struct hda_codec *codec, int enable); 
int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);

void snd_hda_detach_beep_device(struct hda_codec *codec);

#else

#define snd_hda_attach_beep_device(...)		0

#define snd_hda_detach_beep_device(...)

static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)

{

	return 0;

}

static inline void snd_hda_detach_beep_device(struct hda_codec *codec)

{

}

#endif

#endif

sound/pci/hda/patch_realtek.c

+1 −2
Original line number Diff line number Diff line
@@ -13316,9 +13316,8 @@ static void alc268_acer_lc_setup(struct hda_codec *codec) 
	struct alc_spec *spec = codec->spec;

	spec->autocfg.hp_pins[0] = 0x15;

	spec->autocfg.speaker_pins[0] = 0x14;

	spec->automute_mixer_nid[0] = 0x0f;

	spec->automute = 1;

	spec->automute_mode = ALC_AUTOMUTE_MIXER;

	spec->automute_mode = ALC_AUTOMUTE_AMP;

	spec->ext_mic.pin = 0x18;

	spec->ext_mic.mux_idx = 0;

	spec->int_mic.pin = 0x12;

sound/pci/hda/patch_via.c

+7 −4
Original line number Diff line number Diff line
@@ -832,10 +832,13 @@ static int via_hp_build(struct hda_codec *codec) 
	knew->subdevice = HDA_SUBDEV_NID_FLAG | nid;

	knew->private_value = nid;



	nid = side_mute_channel(spec);

	if (nid) {

		knew = via_clone_control(spec, &via_hp_mixer[1]);

		if (knew == NULL)

			return -ENOMEM;

	knew->subdevice = side_mute_channel(spec);

		knew->subdevice = nid;

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE