Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-4
+1
-1
sound/firewire/fireworks/fireworks_transaction.c
+1
-1
sound/firewire/fireworks/fireworks_transaction.c
···
124
124
spin_lock_irq(&efw->lock);
125
125
126
126
t = (struct snd_efw_transaction *)data;
127
-
length = min_t(size_t, t->length * sizeof(t->length), length);
127
+
length = min_t(size_t, be32_to_cpu(t->length) * sizeof(u32), length);
128
128
129
129
if (efw->push_ptr < efw->pull_ptr)
130
130
capacity = (unsigned int)(efw->pull_ptr - efw->push_ptr);
+2
sound/pci/hda/patch_hdmi.c
+2
sound/pci/hda/patch_hdmi.c
···
3353
3353
{ .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch },
3354
3354
{ .id = 0x10de0070, .name = "GPU 70 HDMI/DP", .patch = patch_nvhdmi },
3355
3355
{ .id = 0x10de0071, .name = "GPU 71 HDMI/DP", .patch = patch_nvhdmi },
3356
+
{ .id = 0x10de0072, .name = "GPU 72 HDMI/DP", .patch = patch_nvhdmi },
3356
3357
{ .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch },
3357
3358
{ .id = 0x11069f80, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi },
3358
3359
{ .id = 0x11069f81, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi },
···
3414
3413
MODULE_ALIAS("snd-hda-codec-id:10de0067");
3415
3414
MODULE_ALIAS("snd-hda-codec-id:10de0070");
3416
3415
MODULE_ALIAS("snd-hda-codec-id:10de0071");
3416
+
MODULE_ALIAS("snd-hda-codec-id:10de0072");
3417
3417
MODULE_ALIAS("snd-hda-codec-id:10de8001");
3418
3418
MODULE_ALIAS("snd-hda-codec-id:11069f80");
3419
3419
MODULE_ALIAS("snd-hda-codec-id:11069f81");
+2
-2
sound/pci/hda/patch_sigmatel.c
+2
-2
sound/pci/hda/patch_sigmatel.c
···
568
568
spec->gpio_mask;
569
569
}
570
570
if (get_int_hint(codec, "gpio_dir", &spec->gpio_dir))
571
-
spec->gpio_mask &= spec->gpio_mask;
572
-
if (get_int_hint(codec, "gpio_data", &spec->gpio_data))
573
571
spec->gpio_dir &= spec->gpio_mask;
572
+
if (get_int_hint(codec, "gpio_data", &spec->gpio_data))
573
+
spec->gpio_data &= spec->gpio_mask;
574
574
if (get_int_hint(codec, "eapd_mask", &spec->eapd_mask))
575
575
spec->eapd_mask &= spec->gpio_mask;
576
576
if (get_int_hint(codec, "gpio_mute", &spec->gpio_mute))