Commit eb749269 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "All a few small regression or stable fixes: a Nvidia HDMI ID addition,
  a regression fix for CAIAQ stream count, a typo fix for GPIO setup
  with STAC/IDT HD-audio codecs, and a Fireworks big-endian fix"

* tag 'sound-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: fireworks: fix an endianness bug for transaction length
  ALSA: hda - Add new GPU codec ID 0x10de0072 to snd-hda
  ALSA: hda - Fix wrong gpio_dir & gpio_mask hint setups for IDT/STAC codecs
  ALSA: snd-usb-caiaq: fix stream count check
parents 28023d2a 92cb4658

sound/firewire/fireworks/fireworks_transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ copy_resp_to_buf(struct snd_efw *efw, void *data, size_t length, int *rcode) 
	spin_lock_irq(&efw->lock);



	t = (struct snd_efw_transaction *)data;

	length = min_t(size_t, t->length * sizeof(t->length), length);

	length = min_t(size_t, be32_to_cpu(t->length) * sizeof(u32), length);



	if (efw->push_ptr < efw->pull_ptr)

		capacity = (unsigned int)(efw->pull_ptr - efw->push_ptr);

sound/pci/hda/patch_hdmi.c

+2 −0
Original line number Diff line number Diff line
@@ -3353,6 +3353,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = { 
{ .id = 0x10de0067, .name = "MCP67 HDMI",	.patch = patch_nvhdmi_2ch },

{ .id = 0x10de0070, .name = "GPU 70 HDMI/DP",	.patch = patch_nvhdmi },

{ .id = 0x10de0071, .name = "GPU 71 HDMI/DP",	.patch = patch_nvhdmi },

{ .id = 0x10de0072, .name = "GPU 72 HDMI/DP",	.patch = patch_nvhdmi },

{ .id = 0x10de8001, .name = "MCP73 HDMI",	.patch = patch_nvhdmi_2ch },

{ .id = 0x11069f80, .name = "VX900 HDMI/DP",	.patch = patch_via_hdmi },

{ .id = 0x11069f81, .name = "VX900 HDMI/DP",	.patch = patch_via_hdmi },
@@ -3413,6 +3414,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de0060"); 
MODULE_ALIAS("snd-hda-codec-id:10de0067");

MODULE_ALIAS("snd-hda-codec-id:10de0070");

MODULE_ALIAS("snd-hda-codec-id:10de0071");

MODULE_ALIAS("snd-hda-codec-id:10de0072");

MODULE_ALIAS("snd-hda-codec-id:10de8001");

MODULE_ALIAS("snd-hda-codec-id:11069f80");

MODULE_ALIAS("snd-hda-codec-id:11069f81");

sound/pci/hda/patch_sigmatel.c

+2 −2
Original line number Diff line number Diff line
@@ -568,9 +568,9 @@ static void stac_store_hints(struct hda_codec *codec) 
			spec->gpio_mask;

	}

	if (get_int_hint(codec, "gpio_dir", &spec->gpio_dir))

		spec->gpio_mask &= spec->gpio_mask;

	if (get_int_hint(codec, "gpio_data", &spec->gpio_data))

		spec->gpio_dir &= spec->gpio_mask;

	if (get_int_hint(codec, "gpio_data", &spec->gpio_data))

		spec->gpio_data &= spec->gpio_mask;

	if (get_int_hint(codec, "eapd_mask", &spec->eapd_mask))

		spec->eapd_mask &= spec->gpio_mask;

	if (get_int_hint(codec, "gpio_mute", &spec->gpio_mute))

sound/usb/caiaq/audio.c

+1 −1
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *cdev) 
		return -EINVAL;

	}



	if (cdev->n_streams < 2) {

	if (cdev->n_streams < 1) {

		dev_err(dev, "bogus number of streams: %d\n", cdev->n_streams);

		return -EINVAL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE