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

Commit 4cdbbbd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Here are a collection of small fixes: at this time, we've got a
  slightly high amount, but all small and trivial fixes, and nothing
  scary can be seen there"

* tag 'sound-4.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)
  ALSA: hda/realtek: Add Lenovo L460 to docking unit fixup
  ALSA: timer: Fix negative queue usage by racy accesses
  ASoC: rt5645: fix reg-2f default value.
  ASoC: fsl_ssi: Fix number of words per frame for I2S-slave mode
  ALSA: au88x0: Fix calculation in vortex_wtdma_bufshift()
  ALSA: hda - Add PCI ID for Kabylake-H
  ALSA: echoaudio: Fix memory allocation
  ASoC: Intel: atom: fix missing breaks that would cause the wrong operation to execute
  ALSA: hda - fix read before array start
  ASoC: cx20442: set tty->receiver_room in v253_open
  ASoC: ak4613: Enable cache usage to fix crashes on resume
  ASoC: wm8940: Enable cache usage to fix crashes on resume
  ASoC: Intel: Skylake: Initialize module list for Broxton
  ASoC: wm5102: Correct supported channels on trace compressed DAI
  ASoC: wm5110: Add missing route from OUT3R to SYSCLK
  ASoC: rt5670: fix HP Playback Volume control
  ASoC: hdmi-codec: select CONFIG_HDMI
  ASoC: davinci-mcasp: Fix dra7 DMA offset when using CFG port
  ASoC: hdac_hdmi: Fix potential NULL dereference
  ASoC: ak4613: Remove owner assignment from platform_driver
  ...
parents 4d0a279c 9cd25743

sound/core/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -1955,6 +1955,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, 


		qhead = tu->qhead++;

		tu->qhead %= tu->queue_size;

		tu->qused--;

		spin_unlock_irq(&tu->qlock);



		if (tu->tread) {
@@ -1968,7 +1969,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, 
		}



		spin_lock_irq(&tu->qlock);

		tu->qused--;

		if (err < 0)

			goto _error;

		result += unit;

sound/pci/au88x0/au88x0_core.c

+2 −3
Original line number Diff line number Diff line
@@ -1444,9 +1444,8 @@ static int vortex_wtdma_bufshift(vortex_t * vortex, int wtdma) 
	int page, p, pp, delta, i;



	page =

	    (hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2)) &

	     WT_SUBBUF_MASK)

	    >> WT_SUBBUF_SHIFT;

	    (hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2))

	     >> WT_SUBBUF_SHIFT) & WT_SUBBUF_MASK;

	if (dma->nr_periods >= 4)

		delta = (page - dma->period_real) & 3;

	else {

sound/pci/echoaudio/echoaudio.c

+2 −2
Original line number Diff line number Diff line
@@ -2200,11 +2200,11 @@ static int snd_echo_resume(struct device *dev) 
	u32 pipe_alloc_mask;

	int err;



	commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);

	commpage_bak = kmalloc(sizeof(*commpage), GFP_KERNEL);

	if (commpage_bak == NULL)

		return -ENOMEM;

	commpage = chip->comm_page;

	memcpy(commpage_bak, commpage, sizeof(struct comm_page));

	memcpy(commpage_bak, commpage, sizeof(*commpage));



	err = init_hw(chip, chip->pci->device, chip->pci->subsystem_device);

	if (err < 0) {

sound/pci/hda/hda_generic.c

+2 −0
Original line number Diff line number Diff line
@@ -3977,6 +3977,8 @@ static hda_nid_t set_path_power(struct hda_codec *codec, hda_nid_t nid, 


	for (n = 0; n < spec->paths.used; n++) {

		path = snd_array_elem(&spec->paths, n);

		if (!path->depth)

			continue;

		if (path->path[0] == nid ||

		    path->path[path->depth - 1] == nid) {

			bool pin_old = path->pin_enabled;

sound/pci/hda/hda_intel.c

+5 −1
Original line number Diff line number Diff line
@@ -367,9 +367,10 @@ enum { 
#define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70)

#define IS_KBL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa171)

#define IS_KBL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d71)

#define IS_KBL_H(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa2f0)

#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)

#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \

			IS_KBL(pci) || IS_KBL_LP(pci)

			IS_KBL(pci) || IS_KBL_LP(pci) || IS_KBL_H(pci)



static char *driver_short_names[] = {

	[AZX_DRIVER_ICH] = "HDA Intel",
@@ -2190,6 +2191,9 @@ static const struct pci_device_id azx_ids[] = { 
	/* Kabylake-LP */

	{ PCI_DEVICE(0x8086, 0x9d71),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },

	/* Kabylake-H */

	{ PCI_DEVICE(0x8086, 0xa2f0),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },

	/* Broxton-P(Apollolake) */

	{ PCI_DEVICE(0x8086, 0x5a98),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },