sound fixes for 4.20-rc4
Linus,
please pull sound fixes for v4.20-rc4 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.20-rc4
The topmost commit is a6b0961b39896a9f9f1350d26d202f078a7d9dbc
----------------------------------------------------------------
sound fixes for 4.20-rc4
The only significant change is for OSS PCM emulation to convert with kvcalloc() to address both performance and security issues. It's a pretty straightforward change, which should be safe.
The rest are, as usual, device-specific small fixes for HD-audio.
----------------------------------------------------------------
Connor McAdams (2):
ALSA: hda/ca0132 - Add new ZxR quirk
ALSA: hda/ca0132 - fix AE-5 pincfg
Takashi Iwai (3):
ALSA: oss: Use kvzalloc() for local buffer allocations
ALSA: hda/realtek - Add quirk entry for HP Pavilion 15
ALSA: hda/ca0132 - Call pci_iounmap() instead of iounmap()
--- sound/core/oss/pcm_oss.c | 6 +++--- sound/core/oss/pcm_plugin.c | 6 +++--- sound/pci/hda/patch_ca0132.c | 5 +++-- sound/pci/hda/patch_realtek.c | 1 + 4 files changed, 10 insertions(+), 8 deletions(-)
sound/core/oss/pcm_oss.c +3 -3
@@ -1062,8 +1062,8 @@ static int snd_pcm_oss_change_params_locked(struct snd_pcm_substream *substream) runtime->oss.channels =params_channels (params); runtime->oss.rate =params_rate (params); -vfree (runtime->oss.buffer); - runtime->oss.buffer =vmalloc (runtime->oss.period_bytes); +kvfree (runtime->oss.buffer); + runtime->oss.buffer =kvzalloc (runtime->oss.period_bytes,GFP_KERNEL );if (!runtime->oss.buffer) { err = -ENOMEM ; goto failure;
@@ -2328,7 +2328,7 @@ static void snd_pcm_oss_release_substream(struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime; runtime = substream->runtime; -vfree (runtime->oss.buffer); +kvfree (runtime->oss.buffer); runtime->oss.buffer =NULL ;#ifdef CONFIG_SND_PCM_OSS_PLUGINS snd_pcm_oss_plugin_clear (substream);
sound/core/oss/pcm_plugin.c +3 -3
@@ -66,8 +66,8 @@ static int snd_pcm_plugin_alloc(struct snd_pcm_plugin *plugin, snd_pcm_uframes_treturn -ENXIO ; size /=8 ;if (plugin->buf_frames < frames) { -vfree (plugin->buf); - plugin->buf =vmalloc (size); +kvfree (plugin->buf); + plugin->buf =kvzalloc (size,GFP_KERNEL ); plugin->buf_frames = frames; }if (!plugin->buf) {
@@ -191,7 +191,7 @@ int snd_pcm_plugin_free(struct snd_pcm_plugin *plugin)if (plugin->private_free) plugin->private_free (plugin);kfree (plugin->buf_channels); -vfree (plugin->buf); +kvfree (plugin->buf);kfree (plugin);return 0 ; }
sound/pci/hda/patch_ca0132.c +3 -2
@@ -1177,6 +1177,7 @@ static const struct snd_pci_quirk ca0132_quirks[] = {SND_PCI_QUIRK (0x1028 ,0x0708 ,"Alienware 15 R2 2016" ,QUIRK_ALIENWARE ),SND_PCI_QUIRK (0x1102 ,0x0010 ,"Sound Blaster Z" ,QUIRK_SBZ ),SND_PCI_QUIRK (0x1102 ,0x0023 ,"Sound Blaster Z" ,QUIRK_SBZ ), +SND_PCI_QUIRK (0x1102 ,0x0033 ,"Sound Blaster ZxR" ,QUIRK_SBZ ),SND_PCI_QUIRK (0x1458 ,0xA016 ,"Recon3Di" ,QUIRK_R3DI ),SND_PCI_QUIRK (0x1458 ,0xA026 ,"Gigabyte G1.Sniper Z97" ,QUIRK_R3DI ), SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI),
@@ -8413,7 +8414,7 @@ static void ca0132_free(struct hda_codec *codec)snd_hda_power_down (codec);if (spec->mem_base) -iounmap (spec->mem_base); +pci_iounmap (codec->bus->pci, spec->mem_base);kfree (spec->spec_init_verbs);kfree (codec->spec); }
@@ -8488,7 +8489,7 @@ static void ca0132_config(struct hda_codec *codec)break ;case QUIRK_AE5 :codec_dbg (codec,"%s: QUIRK_AE5 applied.\n" , __func__); -snd_hda_apply_pincfgs (codec, r3di_pincfgs); +snd_hda_apply_pincfgs (codec, ae5_pincfgs);break ; }
sound/pci/hda/patch_realtek.c +1 -0
@@ -6481,6 +6481,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x2336 ,"HP" ,ALC269_FIXUP_HP_MUTE_LED_MIC1 ),SND_PCI_QUIRK (0x103c ,0x2337 ,"HP" ,ALC269_FIXUP_HP_MUTE_LED_MIC1 ),SND_PCI_QUIRK (0x103c ,0x221c ,"HP EliteBook 755 G2" ,ALC280_FIXUP_HP_HEADSET_MIC ), +SND_PCI_QUIRK (0x103c ,0x820d ,"HP Pavilion 15" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x8256 ,"HP" ,ALC221_FIXUP_HP_FRONT_MIC ),SND_PCI_QUIRK (0x103c ,0x827e ,"HP x360" ,ALC295_FIXUP_HP_X360 ), SND_PCI_QUIRK(0x103c, 0x82bf, "HP", ALC221_FIXUP_HP_MIC_NO_PRESENCE),
The pull request you sent on Thu, 22 Nov 2018 11:40:16 +0100:
The pull request you sent on Thu, 22 Nov 2018 11:40:16 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.gittags/sound-4.20-rc4
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/edeca3a769ad28a9477798c3b1d8e0701db728e4
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker