Commit b905e2db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "As a usual pattern, we've got relatively large updates at rc5:

   - A fix for races in ALSA control user elements

   - ASoC DAPM regression due to component refactoring

   - A fix in error handling of ASoC iteration macro

   - ASoC Intel SST Skylake kconfig fix; a new Kconfig will appear as a
     consequence, but in the end it's a good cleanup

   - HD-audio and USB-audio quirks as always

   - Assort of ASoC driver fixes (pcm186x, Intel cht, rockchip, pcm3060,
     rsnd, omap, wm_adsp, qcom, sunxi, stm32)"

* tag 'sound-4.20-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (34 commits)
  ALSA: usb-audio: Add vendor and product name for Dell WD19 Dock
  ALSA: hda/realtek - Support ALC300
  ALSA: hda/realtek - Add auto-mute quirk for HP Spectre x360 laptop
  ALSA: hda/realtek - fix the pop noise on headphone for lenovo laptops
  ALSA: control: Fix race between adding and removing a user element
  ALSA: sparc: Fix invalid snd_free_pages() at error path
  ALSA: wss: Fix invalid snd_free_pages() at error path
  ALSA: hda/realtek - fix headset mic detection for MSI MS-B171
  ALSA: hda: Add ASRock N68C-S UCC the power_save blacklist
  ALSA: ac97: Fix incorrect bit shift at AC97-SPSA control write
  ASoC: omap-dmic: Add pm_qos handling to avoid overruns with CPU_IDLE
  ASoC: omap-mcpdm: Add pm_qos handling to avoid under/overruns with CPU_IDLE
  ASoC: omap-mcbsp: Fix latency value calculation for pm_qos
  ASoC: acpi: fix: continue searching when machine is ignored
  ASoC: Intel: Skylake: fix Kconfigs, make HDaudio codec optional
  MAINTAINERS: add ASoC maintainers for sound dt-bindings
  ASoC: pcm186x: Fix device reset-registers trigger value
  ASoC: dapm: Recalculate audio map forcely when card instantiated
  ASoC: omap-abe-twl6040: Fix missing audio card caused by deferred probing
  ASoC: pcm3060: Rename output widgets
  ...
parents 9af33b57 8159a6a4

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14010,6 +14010,7 @@ S: Supported 
F:	Documentation/devicetree/bindings/sound/

F:	Documentation/sound/soc/

F:	sound/soc/

F:	include/dt-bindings/sound/

F:	include/sound/soc*



SOUNDWIRE SUBSYSTEM

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ struct snd_soc_pcm_runtime { 
	     ((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \

	     (i)++)

#define for_each_rtd_codec_dai_rollback(rtd, i, dai)		\

	for (; ((i--) >= 0) && ((dai) = rtd->codec_dais[i]);)

	for (; ((--i) >= 0) && ((dai) = rtd->codec_dais[i]);)





/* mixer control */

sound/core/control.c

+45 −35
Original line number Diff line number Diff line
@@ -348,6 +348,40 @@ static int snd_ctl_find_hole(struct snd_card *card, unsigned int count) 
	return 0;

}



/* add a new kcontrol object; call with card->controls_rwsem locked */

static int __snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)

{

	struct snd_ctl_elem_id id;

	unsigned int idx;

	unsigned int count;



	id = kcontrol->id;

	if (id.index > UINT_MAX - kcontrol->count)

		return -EINVAL;



	if (snd_ctl_find_id(card, &id)) {

		dev_err(card->dev,

			"control %i:%i:%i:%s:%i is already present\n",

			id.iface, id.device, id.subdevice, id.name, id.index);

		return -EBUSY;

	}



	if (snd_ctl_find_hole(card, kcontrol->count) < 0)

		return -ENOMEM;



	list_add_tail(&kcontrol->list, &card->controls);

	card->controls_count += kcontrol->count;

	kcontrol->id.numid = card->last_numid + 1;

	card->last_numid += kcontrol->count;



	id = kcontrol->id;

	count = kcontrol->count;

	for (idx = 0; idx < count; idx++, id.index++, id.numid++)

		snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);



	return 0;

}



/**

 * snd_ctl_add - add the control instance to the card

 * @card: the card instance
@@ -364,45 +398,18 @@ static int snd_ctl_find_hole(struct snd_card *card, unsigned int count) 
 */

int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)

{

	struct snd_ctl_elem_id id;

	unsigned int idx;

	unsigned int count;

	int err = -EINVAL;



	if (! kcontrol)

		return err;

	if (snd_BUG_ON(!card || !kcontrol->info))

		goto error;

	id = kcontrol->id;

	if (id.index > UINT_MAX - kcontrol->count)

		goto error;



	down_write(&card->controls_rwsem);

	if (snd_ctl_find_id(card, &id)) {

		up_write(&card->controls_rwsem);

		dev_err(card->dev, "control %i:%i:%i:%s:%i is already present\n",

					id.iface,

					id.device,

					id.subdevice,

					id.name,

					id.index);

		err = -EBUSY;

		goto error;

	}

	if (snd_ctl_find_hole(card, kcontrol->count) < 0) {

	err = __snd_ctl_add(card, kcontrol);

	up_write(&card->controls_rwsem);

		err = -ENOMEM;

	if (err < 0)

		goto error;

	}

	list_add_tail(&kcontrol->list, &card->controls);

	card->controls_count += kcontrol->count;

	kcontrol->id.numid = card->last_numid + 1;

	card->last_numid += kcontrol->count;

	id = kcontrol->id;

	count = kcontrol->count;

	up_write(&card->controls_rwsem);

	for (idx = 0; idx < count; idx++, id.index++, id.numid++)

		snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);

	return 0;



 error:
@@ -1361,9 +1368,12 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, 
		kctl->tlv.c = snd_ctl_elem_user_tlv;



	/* This function manage to free the instance on failure. */

	err = snd_ctl_add(card, kctl);

	if (err < 0)

		return err;

	down_write(&card->controls_rwsem);

	err = __snd_ctl_add(card, kctl);

	if (err < 0) {

		snd_ctl_free_one(kctl);

		goto unlock;

	}

	offset = snd_ctl_get_ioff(kctl, &info->id);

	snd_ctl_build_ioff(&info->id, kctl, offset);

	/*
@@ -1374,10 +1384,10 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, 
	 * which locks the element.

	 */



	down_write(&card->controls_rwsem);

	card->user_ctl_count++;

	up_write(&card->controls_rwsem);



 unlock:

	up_write(&card->controls_rwsem);

	return 0;

}

sound/isa/wss/wss_lib.c

+0 −2
Original line number Diff line number Diff line
@@ -1531,7 +1531,6 @@ static int snd_wss_playback_open(struct snd_pcm_substream *substream) 
	if (err < 0) {

		if (chip->release_dma)

			chip->release_dma(chip, chip->dma_private_data, chip->dma1);

		snd_free_pages(runtime->dma_area, runtime->dma_bytes);

		return err;

	}

	chip->playback_substream = substream;
@@ -1572,7 +1571,6 @@ static int snd_wss_capture_open(struct snd_pcm_substream *substream) 
	if (err < 0) {

		if (chip->release_dma)

			chip->release_dma(chip, chip->dma_private_data, chip->dma2);

		snd_free_pages(runtime->dma_area, runtime->dma_bytes);

		return err;

	}

	chip->capture_substream = substream;

sound/pci/ac97/ac97_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ static int snd_ac97_put_spsa(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_ 
{

	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);

	int reg = kcontrol->private_value & 0xff;

	int shift = (kcontrol->private_value >> 8) & 0xff;

	int shift = (kcontrol->private_value >> 8) & 0x0f;

	int mask = (kcontrol->private_value >> 16) & 0xff;

	// int invert = (kcontrol->private_value >> 24) & 0xff;

	unsigned short value, old, new;

CRA Git | Maintained and supported by SUSTech CRA and CCSE