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

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

Pull sound fixes from Takashi Iwai:
 "Quite a bunch of small fixes that have been gathered since the last
  pull, including changes like below:

   - HD-audio runtime PM fixes and refactoring

   - HD-audio and USB-audio quirks

   - SOF warning fix

   - Various ASoC device-specific fixes for Intel, Qualcomm, etc"

* tag 'sound-5.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (26 commits)
  ALSA: usb-audio: Add implicit feedback quirk for Qu-16
  ASoC: mchp-spdiftx: Do not set Validity bit(s)
  ALSA: usb-audio: Add implicit feedback quirk for MODX
  ALSA: usb-audio: add usb vendor id as DSD-capable for Khadas devices
  ALSA: hda/realtek - Enable headphone for ASUS TM420
  ALSA: hda: prevent undefined shift in snd_hdac_ext_bus_get_link()
  ASoC: qcom: lpass-cpu: Fix clock disable failure
  ASoC: qcom: lpass-sc7180: Fix MI2S bitwidth field bit positions
  ASoC: codecs: wcd9335: Set digital gain range correctly
  ASoC: codecs: wcd934x: Set digital gain range correctly
  ALSA: hda: Reinstate runtime_allow() for all hda controllers
  ALSA: hda: Separate runtime and system suspend
  ALSA: hda: Refactor codec PM to use direct-complete optimization
  ALSA: hda/realtek - Fixed HP headset Mic can't be detected
  ALSA: usb-audio: Add implicit feedback quirk for Zoom UAC-2
  ALSA: make snd_kcontrol_new name a normal string
  ALSA: fix kernel-doc markups
  ASoC: SOF: loader: handle all SOF_IPC_EXT types
  ASoC: cs42l51: manage mclk shutdown delay
  ASoC: qcom: sdm845: set driver name correctly
  ...
parents fc7b66ef a6c96672

include/sound/control.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct snd_kcontrol_new { 
	snd_ctl_elem_iface_t iface;	/* interface identifier */

	unsigned int device;		/* device/client number */

	unsigned int subdevice;		/* subdevice (substream) number */

	const unsigned char *name;	/* ASCII name of item */

	const char *name;		/* ASCII name of item */

	unsigned int index;		/* index of item */

	unsigned int access;		/* access rights */

	unsigned int count;		/* count of same elements */

include/sound/core.h

+2 −1
Original line number Diff line number Diff line
@@ -332,7 +332,8 @@ void __snd_printk(unsigned int level, const char *file, int line, 
#define snd_BUG()		WARN(1, "BUG?\n")



/**

 * Suppress high rates of output when CONFIG_SND_DEBUG is enabled.

 * snd_printd_ratelimit - Suppress high rates of output when

 * 			  CONFIG_SND_DEBUG is enabled.

 */

#define snd_printd_ratelimit() printk_ratelimit()

include/sound/pcm.h

+2 −2
Original line number Diff line number Diff line
@@ -1284,8 +1284,8 @@ snd_pcm_sgbuf_get_ptr(struct snd_pcm_substream *substream, unsigned int ofs) 
}



/**

 * snd_pcm_sgbuf_chunk_size - Compute the max size that fits within the contig.

 * page from the given size

 * snd_pcm_sgbuf_get_chunk_size - Compute the max size that fits within the

 * contig. page from the given size

 * @substream: PCM substream

 * @ofs: byte offset

 * @size: byte size to examine

include/uapi/sound/compress_offload.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ struct snd_compr_metadata { 
	 __u32 value[8];

} __attribute__((packed, aligned(4)));



/**

/*

 * compress path ioctl definitions

 * SNDRV_COMPRESS_GET_CAPS: Query capability of DSP

 * SNDRV_COMPRESS_GET_CODEC_CAPS: Query capability of a codec

sound/core/control.c

+2 −2
Original line number Diff line number Diff line
@@ -1925,8 +1925,8 @@ EXPORT_SYMBOL(snd_ctl_unregister_ioctl); 


#ifdef CONFIG_COMPAT

/**

 * snd_ctl_unregister_ioctl - de-register the device-specific compat 32bit

 * control-ioctls

 * snd_ctl_unregister_ioctl_compat - de-register the device-specific compat

 * 32bit control-ioctls

 * @fcn: ioctl callback function to unregister

 */

int snd_ctl_unregister_ioctl_compat(snd_kctl_ioctl_func_t fcn)

CRA Git | Maintained and supported by SUSTech CRA and CCSE