Commit 0a566d43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes.

  The major changes are ASoC core fixes, addressing the DPCM locking
  issue after the recent code changes and the potentially invalid
  register accesses via control API. Also, HD-audio got a core fix for
  Oops at dynamic unbinding.

  The rest are device-specific small fixes, including the usual stuff
  like HD-audio and USB-audio quirks"

* tag 'sound-5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (31 commits)
  ALSA: hda: Skip codec shutdown in case the codec is not registered
  ALSA: usb-audio: Correct quirk for VF0770
  ALSA: Replace acpi_bus_get_device()
  Input: wm97xx: Simplify resource management
  ALSA: hda/realtek: Add quirk for ASUS GU603
  ALSA: hda/realtek: Fix silent output on Gigabyte X570 Aorus Xtreme after reboot from Windows
  ALSA: hda/realtek: Fix silent output on Gigabyte X570S Aorus Master (newer chipset)
  ALSA: hda/realtek: Add missing fixup-model entry for Gigabyte X570 ALC1220 quirks
  ALSA: hda: realtek: Fix race at concurrent COEF updates
  ASoC: ops: Check for negative values before reading them
  ASoC: rt5682: Fix deadlock on resume
  ASoC: hdmi-codec: Fix OOB memory accesses
  ASoC: soc-pcm: Move debugfs removal out of spinlock
  ASoC: soc-pcm: Fix DPCM lockdep warning due to nested stream locks
  ASoC: fsl: Add missing error handling in pcm030_fabric_probe
  ALSA: hda: Fix signedness of sscanf() arguments
  ALSA: usb-audio: initialize variables that could ignore errors
  ALSA: hda: Fix UAF of leds class devs at unbinding
  ASoC: qdsp6: q6apm-dai: only stop graphs that are started
  ASoC: codecs: wcd938x: fix return value of mixer put function
  ...
parents 31462d9e 52517d9c

drivers/input/touchscreen/wm97xx-core.c

+3 −9
Original line number Diff line number Diff line
@@ -615,10 +615,9 @@ static int wm97xx_register_touch(struct wm97xx *wm) 
	 * extensions)

	 */

	wm->touch_dev = platform_device_alloc("wm97xx-touch", -1);

	if (!wm->touch_dev) {

		ret = -ENOMEM;

		goto touch_err;

	}

	if (!wm->touch_dev)

		return -ENOMEM;



	platform_set_drvdata(wm->touch_dev, wm);

	wm->touch_dev->dev.parent = wm->dev;

	wm->touch_dev->dev.platform_data = pdata;
@@ -629,9 +628,6 @@ static int wm97xx_register_touch(struct wm97xx *wm) 
	return 0;

touch_reg_err:

	platform_device_put(wm->touch_dev);

touch_err:

	input_unregister_device(wm->input_dev);

	wm->input_dev = NULL;



	return ret;

}
@@ -639,8 +635,6 @@ static int wm97xx_register_touch(struct wm97xx *wm) 
static void wm97xx_unregister_touch(struct wm97xx *wm)

{

	platform_device_unregister(wm->touch_dev);

	input_unregister_device(wm->input_dev);

	wm->input_dev = NULL;

}



static int _wm97xx_probe(struct wm97xx *wm)

include/sound/pcm.h

+15 −0
Original line number Diff line number Diff line
@@ -617,6 +617,7 @@ void snd_pcm_stream_unlock(struct snd_pcm_substream *substream); 
void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream);

void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream);

unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream);

unsigned long _snd_pcm_stream_lock_irqsave_nested(struct snd_pcm_substream *substream);



/**

 * snd_pcm_stream_lock_irqsave - Lock the PCM stream
@@ -635,6 +636,20 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream); 
void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream,

				      unsigned long flags);



/**

 * snd_pcm_stream_lock_irqsave_nested - Single-nested PCM stream locking

 * @substream: PCM substream

 * @flags: irq flags

 *

 * This locks the PCM stream like snd_pcm_stream_lock_irqsave() but with

 * the single-depth lockdep subclass.

 */

#define snd_pcm_stream_lock_irqsave_nested(substream, flags)		\

	do {								\

		typecheck(unsigned long, flags);			\

		flags = _snd_pcm_stream_lock_irqsave_nested(substream); \

	} while (0)



/**

 * snd_pcm_group_for_each_entry - iterate over the linked substreams

 * @s: the iterator

include/uapi/sound/asound.h

+3 −1
Original line number Diff line number Diff line
@@ -56,8 +56,10 @@ 
 *                                                                          *

 ****************************************************************************/



#define AES_IEC958_STATUS_SIZE		24



struct snd_aes_iec958 {

	unsigned char status[24];	/* AES/IEC958 channel status bits */

	unsigned char status[AES_IEC958_STATUS_SIZE]; /* AES/IEC958 channel status bits */

	unsigned char subcode[147];	/* AES/IEC958 subcode bits */

	unsigned char pad;		/* nothing */

	unsigned char dig_subframe[4];	/* AES/IEC958 subframe bits */

sound/core/pcm_native.c

+13 −0
Original line number Diff line number Diff line
@@ -172,6 +172,19 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream) 
}

EXPORT_SYMBOL_GPL(_snd_pcm_stream_lock_irqsave);



unsigned long _snd_pcm_stream_lock_irqsave_nested(struct snd_pcm_substream *substream)

{

	unsigned long flags = 0;

	if (substream->pcm->nonatomic)

		mutex_lock_nested(&substream->self_group.mutex,

				  SINGLE_DEPTH_NESTING);

	else

		spin_lock_irqsave_nested(&substream->self_group.lock, flags,

					 SINGLE_DEPTH_NESTING);

	return flags;

}

EXPORT_SYMBOL_GPL(_snd_pcm_stream_lock_irqsave_nested);



/**

 * snd_pcm_stream_unlock_irqrestore - Unlock the PCM stream

 * @substream: PCM substream

sound/hda/intel-sdw-acpi.c

+3 −4
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ static bool is_link_enabled(struct fwnode_handle *fw_node, int i) 
static int

sdw_intel_scan_controller(struct sdw_intel_acpi_info *info)

{

	struct acpi_device *adev;

	struct acpi_device *adev = acpi_fetch_acpi_dev(info->handle);

	int ret, i;

	u8 count;



	if (acpi_bus_get_device(info->handle, &adev))

	if (!adev)

		return -EINVAL;



	/* Found controller, find links supported */
@@ -119,7 +119,6 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, 
				     void *cdata, void **return_value)

{

	struct sdw_intel_acpi_info *info = cdata;

	struct acpi_device *adev;

	acpi_status status;

	u64 adr;
@@ -127,7 +126,7 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, 
	if (ACPI_FAILURE(status))

		return AE_OK; /* keep going */



	if (acpi_bus_get_device(handle, &adev)) {

	if (!acpi_fetch_acpi_dev(handle)) {

		pr_err("%s: Couldn't find ACPI handle\n", __func__);

		return AE_NOT_FOUND;

	}