Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 630db0e3 authored Oct 17, 2013 by Linus Torvalds

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

parents b2118ea9 d14df339

sound/pci/hda/hda_generic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3531,7 +3531,7 @@ static int create_capture_mixers(struct hda_codec *codec)
		if (!multi)
		err = create_single_cap_vol_ctl(codec, n, vol, sw,
		inv_dmic);
		else if (!multi_cap_vol)
		else if (!multi_cap_vol && !inv_dmic)
		err = create_bind_cap_vol_ctl(codec, n, vol, sw);
		else
		err = create_multi_cap_vol_ctl(codec);

sound/pci/rme9652/hdsp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -4845,6 +4845,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep hw, struct file file, unsigne
		if ((err = hdsp_get_iobox_version(hdsp)) < 0)
		return err;
		}
		memset(&hdsp_version, 0, sizeof(hdsp_version));
		hdsp_version.io_type = hdsp->io_type;
		hdsp_version.firmware_rev = hdsp->firmware_rev;
		if ((err = copy_to_user(argp, &hdsp_version, sizeof(hdsp_version))))

sound/usb/usx2y/us122l.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -262,7 +262,9 @@ static int usb_stream_hwdep_mmap(struct snd_hwdep *hw,
		}

		area->vm_ops = &usb_stream_hwdep_vm_ops;
		area->vm_flags \|= VM_DONTEXPAND \| VM_DONTDUMP;
		area->vm_flags \|= VM_DONTDUMP;
		if (!read)
		area->vm_flags \|= VM_DONTEXPAND;
		area->vm_private_data = us122l;
		atomic_inc(&us122l->mmap_count);
		out: