tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Pull sound fixes from Takashi Iwai:
"A few small last-minute fixes that should sneak into 4.15:

- remove a spurious WARN_ON() triggered by syzkaller

- fix for ioctl races in ALSA sequencer

- two trivial HD-audio fixup entries"

* tag 'sound-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: seq: Make ioctls race-free
ALSA: pcm: Remove yet superfluous WARN_ON()
ALSA: hda - Apply the existing quirk to iMac 14,1
ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant

Linus Torvalds 41aa5e5d 921d4f67

+6 -1
unified split
-1
sound/core/pcm_lib.c
··· 560 { 561 u_int64_t n = (u_int64_t) a * b; 562 if (c == 0) { 563 - snd_BUG_ON(!n); 564 *r = 0; 565 return UINT_MAX; 566 }
··· 560 { 561 u_int64_t n = (u_int64_t) a * b; 562 if (c == 0) { 563 *r = 0; 564 return UINT_MAX; 565 }
+3
sound/core/seq/seq_clientmgr.c
··· 221 rwlock_init(&client->ports_lock); 222 mutex_init(&client->ports_mutex); 223 INIT_LIST_HEAD(&client->ports_list_head); 224 225 /* find free slot in the client table */ 226 spin_lock_irqsave(&clients_lock, flags); ··· 2131 return -EFAULT; 2132 } 2133 2134 err = handler->func(client, &buf); 2135 if (err >= 0) { 2136 /* Some commands includes a bug in 'dir' field. */ 2137 if (handler->cmd == SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT ||
··· 221 rwlock_init(&client->ports_lock); 222 mutex_init(&client->ports_mutex); 223 INIT_LIST_HEAD(&client->ports_list_head); 224 + mutex_init(&client->ioctl_mutex); 225 226 /* find free slot in the client table */ 227 spin_lock_irqsave(&clients_lock, flags); ··· 2130 return -EFAULT; 2131 } 2132 2133 + mutex_lock(&client->ioctl_mutex); 2134 err = handler->func(client, &buf); 2135 + mutex_unlock(&client->ioctl_mutex); 2136 if (err >= 0) { 2137 /* Some commands includes a bug in 'dir' field. */ 2138 if (handler->cmd == SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT ||
+1
sound/core/seq/seq_clientmgr.h
··· 61 struct list_head ports_list_head; 62 rwlock_t ports_lock; 63 struct mutex ports_mutex; 64 int convert32; /* convert 32->64bit */ 65 66 /* output pool */
··· 61 struct list_head ports_list_head; 62 rwlock_t ports_lock; 63 struct mutex ports_mutex; 64 + struct mutex ioctl_mutex; 65 int convert32; /* convert 32->64bit */ 66 67 /* output pool */
+1
sound/pci/hda/patch_cirrus.c
··· 408 /*SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),*/ 409 410 /* codec SSID */ 411 SND_PCI_QUIRK(0x106b, 0x1c00, "MacBookPro 8,1", CS420X_MBP81), 412 SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122), 413 SND_PCI_QUIRK(0x106b, 0x2800, "MacBookPro 10,1", CS420X_MBP101),
··· 408 /*SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),*/ 409 410 /* codec SSID */ 411 + SND_PCI_QUIRK(0x106b, 0x0600, "iMac 14,1", CS420X_IMAC27_122), 412 SND_PCI_QUIRK(0x106b, 0x1c00, "MacBookPro 8,1", CS420X_MBP81), 413 SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122), 414 SND_PCI_QUIRK(0x106b, 0x2800, "MacBookPro 10,1", CS420X_MBP101),
+1
sound/pci/hda/patch_realtek.c
··· 6196 SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE), 6197 SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME), 6198 SND_PCI_QUIRK(0x1028, 0x0798, "Dell Inspiron 17 7000 Gaming", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER), 6199 SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), 6200 SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), 6201 SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
··· 6196 SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE), 6197 SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME), 6198 SND_PCI_QUIRK(0x1028, 0x0798, "Dell Inspiron 17 7000 Gaming", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER), 6199 + SND_PCI_QUIRK(0x1028, 0x082a, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE), 6200 SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), 6201 SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), 6202 SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),