Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"All reasonably small fixes as rc6: a HD-audio mic fix, a us122l mmap
regression fix, and kernel memory leak fix in hdsp driver. Hopefully
this will be the last pull request for 3.12..."
* tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hdsp - info leak in snd_hdsp_hwdep_ioctl()
ALSA: us122l: Fix pcm_usb_stream mmapping regression
ALSA: hda - Fix inverted internal mic not indicated on some machines
+5
-2
+1
-1
sound/pci/hda/hda_generic.c
+1
-1
sound/pci/hda/hda_generic.c
···
3531
3531
if (!multi)
3532
3532
err = create_single_cap_vol_ctl(codec, n, vol, sw,
3533
3533
inv_dmic);
3534
-
else if (!multi_cap_vol)
3534
+
else if (!multi_cap_vol && !inv_dmic)
3535
3535
err = create_bind_cap_vol_ctl(codec, n, vol, sw);
3536
3536
else
3537
3537
err = create_multi_cap_vol_ctl(codec);
+1
sound/pci/rme9652/hdsp.c
+1
sound/pci/rme9652/hdsp.c
···
4845
4845
if ((err = hdsp_get_iobox_version(hdsp)) < 0)
4846
4846
return err;
4847
4847
}
4848
+
memset(&hdsp_version, 0, sizeof(hdsp_version));
4848
4849
hdsp_version.io_type = hdsp->io_type;
4849
4850
hdsp_version.firmware_rev = hdsp->firmware_rev;
4850
4851
if ((err = copy_to_user(argp, &hdsp_version, sizeof(hdsp_version))))
+3
-1
sound/usb/usx2y/us122l.c
+3
-1
sound/usb/usx2y/us122l.c
···
262
262
}
263
263
264
264
area->vm_ops = &usb_stream_hwdep_vm_ops;
265
-
area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
265
+
area->vm_flags |= VM_DONTDUMP;
266
+
if (!read)
267
+
area->vm_flags |= VM_DONTEXPAND;
266
268
area->vm_private_data = us122l;
267
269
atomic_inc(&us122l->mmap_count);
268
270
out: