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

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

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

Pull sound fixes from Takashi Iwai:
 "Since we got a bonus week, let me try to screw a few pending fixes.

  A slightly large fix is the locking fix in ASoC STI driver, but it's
  pretty board-specific, and the risk is fairly low.

  All the rest are small / trivial fixes, mostly marked as stable, for
  ALSA sequencer core, ASoC topology, ASoC Intel bytcr and Firewire
  drivers"

* tag 'sound-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: intel: Fix PM and non-atomic crash in bytcr drivers
  ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type
  ALSA: seq: Don't break snd_use_lock_sync() loop by timeout
  ASoC: topology: Fix to store enum text values
  ASoC: STI: Fix null ptr deference in IRQ handler
  ALSA: oxfw: fix regression to handle Stanton SCS.1m/1d
parents ea839b41 d4a2fbce

sound/core/seq/seq_lock.c

+3 −6
Original line number Diff line number Diff line
@@ -28,19 +28,16 @@ 
/* wait until all locks are released */

void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)

{

	int max_count = 5 * HZ;

	int warn_count = 5 * HZ;



	if (atomic_read(lockp) < 0) {

		pr_warn("ALSA: seq_lock: lock trouble [counter = %d] in %s:%d\n", atomic_read(lockp), file, line);

		return;

	}

	while (atomic_read(lockp) > 0) {

		if (max_count == 0) {

			pr_warn("ALSA: seq_lock: timeout [%d left] in %s:%d\n", atomic_read(lockp), file, line);

			break;

		}

		if (warn_count-- == 0)

			pr_warn("ALSA: seq_lock: waiting [%d left] in %s:%d\n", atomic_read(lockp), file, line);

		schedule_timeout_uninterruptible(1);

		max_count--;

	}

}

sound/firewire/lib.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct snd_fw_async_midi_port { 


	struct snd_rawmidi_substream *substream;

	snd_fw_async_midi_port_fill fill;

	unsigned int consume_bytes;

	int consume_bytes;

};



int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port,

sound/firewire/oxfw/oxfw.c

+2 −2
Original line number Diff line number Diff line
@@ -227,11 +227,11 @@ static void do_registration(struct work_struct *work) 
	if (err < 0)

		goto error;



	err = detect_quirks(oxfw);

	err = snd_oxfw_stream_discover(oxfw);

	if (err < 0)

		goto error;



	err = snd_oxfw_stream_discover(oxfw);

	err = detect_quirks(oxfw);

	if (err < 0)

		goto error;

sound/soc/intel/boards/bytcr_rt5640.c

+2 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.ignore_suspend = 1,

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,
@@ -634,7 +634,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.ignore_suspend = 1,

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,
@@ -661,6 +660,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { 
						| SND_SOC_DAIFMT_CBS_CFS,

		.be_hw_params_fixup = byt_rt5640_codec_fixup,

		.ignore_suspend = 1,

		.nonatomic = true,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.init = byt_rt5640_init,

sound/soc/intel/boards/bytcr_rt5651.c

+0 −2
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.ignore_suspend = 1,

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,
@@ -249,7 +248,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.ignore_suspend = 1,

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,