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

Merge tag 'sound-fix-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of fixes for 6.6-rc1. All small and easy ones.

   - The corrections of the previous PCM iov_iter transitions

   - Regression fixes in MIDI 2.0 / USB changes

   - Various ASoC codec fixes for Cirrus, Realtek, WCD

   - ASoC AMD quirks and ASoC Intel AVS driver workaround"

* tag 'sound-fix-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)
  ALSA: hda/realtek - ALC287 I2S speaker platform support
  ASoC: amd: yc: Fix a non-functional mic on Lenovo 82TL
  ASoC: Intel: avs: Provide support for fallback topology
  ALSA: seq: Fix snd_seq_expand_var_event() call to user-space
  ALSA: usb-audio: Fix potential memory leaks at error path for UMP open
  ALSA: hda/cirrus: Fix broken audio on hardware with two CS42L42 codecs.
  ASoC: rt5645: NULL pointer access when removing jack
  ASoC: amd: yc: Add DMI entries to support Victus by HP Gaming Laptop 15-fb0xxx (8A3E)
  MAINTAINERS: Update the MAINTAINERS enties for TEXAS INSTRUMENTS ASoC DRIVERS
  ALSA: sb: Fix wrong argument in commented code
  ALSA: pcm: Fix error checks of default read/write copy ops
  ASoC: Name iov_iter argument as iterator instead of buffer
  ASoC: dmaengine: Drop unused iov_iter for process callback
  ALSA: hda/tas2781: Use standard clamp() macro
  ASoC: cs35l56: Waiting for firmware to boot must be tolerant of I/O errors
  ASoC: dt-bindings: fsl_easrc: Add support for imx8mp-easrc
  ASoC: cs42l43: Fix missing error code in cs42l43_codec_probe()
  ASoC: cs35l45: Rename DACPCM1 Source control
  ASoC: cs35l45: Fix "Dead assigment" warning
  ASoC: cs35l45: Add support for Chip ID 0x35A460
  ...
parents ca9c7abf ecc8b4d0

Documentation/devicetree/bindings/sound/fsl,easrc.yaml

+7 −1
Original line number Diff line number Diff line
@@ -14,7 +14,13 @@ properties: 
    pattern: "^easrc@.*"



  compatible:

    const: fsl,imx8mn-easrc

    oneOf:

      - enum:

          - fsl,imx8mn-easrc

      - items:

          - enum:

              - fsl,imx8mp-easrc

          - const: fsl,imx8mn-easrc



  reg:

    maxItems: 1

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -21244,7 +21244,7 @@ F: sound/soc/ti/ 
TEXAS INSTRUMENTS AUDIO (ASoC/HDA) DRIVERS

M:	Shenghao Ding <shenghao-ding@ti.com>

M:	Kevin Lu <kevin-lu@ti.com>

M:	Baojun Xu <x1077012@ti.com>

M:	Baojun Xu <baojun.xu@ti.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/sound/tas2552.txt

include/sound/dmaengine_pcm.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ struct snd_dmaengine_pcm_config { 
			struct snd_pcm_substream *substream);

	int (*process)(struct snd_pcm_substream *substream,

		       int channel, unsigned long hwoff,

		       struct iov_iter *buf, unsigned long bytes);

		       unsigned long bytes);

	dma_filter_fn compat_filter_fn;

	struct device *dma_dev;

	const char *chan_names[SNDRV_PCM_STREAM_LAST + 1];

include/sound/soc-component.h

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ struct snd_soc_component_driver { 
		struct snd_pcm_audio_tstamp_report *audio_tstamp_report);

	int (*copy)(struct snd_soc_component *component,

		    struct snd_pcm_substream *substream, int channel,

		    unsigned long pos, struct iov_iter *buf,

		    unsigned long pos, struct iov_iter *iter,

		    unsigned long bytes);

	struct page *(*page)(struct snd_soc_component *component,

			     struct snd_pcm_substream *substream,
@@ -511,7 +511,7 @@ int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream, 
int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream);

int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream,

			       int channel, unsigned long pos,

			       struct iov_iter *buf, unsigned long bytes);

			       struct iov_iter *iter, unsigned long bytes);

struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,

					unsigned long offset);

int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,

sound/core/pcm_lib.c

+4 −4
Original line number Diff line number Diff line
@@ -1992,8 +1992,8 @@ static int default_write_copy(struct snd_pcm_substream *substream, 
			      int channel, unsigned long hwoff,

			      struct iov_iter *iter, unsigned long bytes)

{

	if (!copy_from_iter(get_dma_ptr(substream->runtime, channel, hwoff),

			    bytes, iter))

	if (copy_from_iter(get_dma_ptr(substream->runtime, channel, hwoff),

			   bytes, iter) != bytes)

		return -EFAULT;

	return 0;

}
@@ -2025,8 +2025,8 @@ static int default_read_copy(struct snd_pcm_substream *substream, 
			     int channel, unsigned long hwoff,

			     struct iov_iter *iter, unsigned long bytes)

{

	if (!copy_to_iter(get_dma_ptr(substream->runtime, channel, hwoff),

			  bytes, iter))

	if (copy_to_iter(get_dma_ptr(substream->runtime, channel, hwoff),

			 bytes, iter) != bytes)

		return -EFAULT;

	return 0;

}