Commit 07d5ac6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This became bigger than I have hoped for rc7. But, the only large LOC
  is for stm32 fixes that are simple rewriting of register access
  helpers, while the rest are all nice and small fixes:

   - A few ASoC fixes for the remaining probe error handling bugs

   - ALSA sequencer core fix for racy proc file accesses

   - Revert the option rename of snd-hda-intel to make compatible again

   - Various device-specific fixes"

* tag 'sound-5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: seq: Fix racy access for queue timer in proc read
  ALSA: usb-audio: fix sync-ep altsetting sanity check
  ASoC: msm8916-wcd-digital: Reset RX interpolation path after use
  ASoC: msm8916-wcd-analog: Fix MIC BIAS Internal1
  ASoC: cros_ec_codec: Make the device acpi compatible
  ASoC: sti: fix possible sleep-in-atomic
  ASoC: msm8916-wcd-analog: Fix selected events for MIC BIAS External1
  ASoC: hdac_hda: Fix error in driver removal after failed probe
  ASoC: SOF: Intel: fix HDA codec driver probe with multiple controllers
  ASoC: SOF: Intel: lower print level to dbg if we will reinit DSP
  ALSA: dice: fix fallback from protocol extension into limited functionality
  ALSA: firewire-tascam: fix corruption due to spin lock without restoration in SoftIRQ context
  ALSA: hda: Rename back to dmic_detect option
  ASoC: stm32: dfsdm: fix 16 bits record
  ASoC: stm32: sai: fix possible circular locking
  ASoC: Fix NULL dereference at freeing
  ASoC: Intel: bytcht_es8316: Fix Irbis NB41 netbook quirk
  ASoC: rt5640: Fix NULL dereference on module unload
parents 13b2668d e5dbdcb3

sound/core/seq/seq_timer.c

+9 −5
Original line number Diff line number Diff line
@@ -471,15 +471,19 @@ void snd_seq_info_timer_read(struct snd_info_entry *entry, 
		q = queueptr(idx);

		if (q == NULL)

			continue;

		if ((tmr = q->timer) == NULL ||

		    (ti = tmr->timeri) == NULL) {

			queuefree(q);

			continue;

		}

		mutex_lock(&q->timer_mutex);

		tmr = q->timer;

		if (!tmr)

			goto unlock;

		ti = tmr->timeri;

		if (!ti)

			goto unlock;

		snd_iprintf(buffer, "Timer for queue %i : %s\n", q->queue, ti->timer->name);

		resolution = snd_timer_resolution(ti) * tmr->ticks;

		snd_iprintf(buffer, "  Period time : %lu.%09lu\n", resolution / 1000000000, resolution % 1000000000);

		snd_iprintf(buffer, "  Skew : %u / %u\n", tmr->skew, tmr->skew_base);

unlock:

		mutex_unlock(&q->timer_mutex);

		queuefree(q);

 	}

}

sound/firewire/dice/dice-extension.c

+4 −1
Original line number Diff line number Diff line
@@ -159,10 +159,13 @@ int snd_dice_detect_extension_formats(struct snd_dice *dice) 
		int j;



		for (j = i + 1; j < 9; ++j) {

			if (pointers[i * 2] == pointers[j * 2])

			if (pointers[i * 2] == pointers[j * 2]) {

				// Fallback to limited functionality.

				err = -ENXIO;

				goto end;

			}

		}

	}



	section_addr = DICE_EXT_APP_SPACE + be32_to_cpu(pointers[12]) * 4;

	err = detect_stream_formats(dice, section_addr);

sound/firewire/tascam/amdtp-tascam.c

+3 −2
Original line number Diff line number Diff line
@@ -157,14 +157,15 @@ static void read_status_messages(struct amdtp_stream *s, 
			if ((before ^ after) & mask) {

				struct snd_firewire_tascam_change *entry =

						&tscm->queue[tscm->push_pos];

				unsigned long flag;



				spin_lock_irq(&tscm->lock);

				spin_lock_irqsave(&tscm->lock, flag);

				entry->index = index;

				entry->before = before;

				entry->after = after;

				if (++tscm->push_pos >= SND_TSCM_QUEUE_COUNT)

					tscm->push_pos = 0;

				spin_unlock_irq(&tscm->lock);

				spin_unlock_irqrestore(&tscm->lock, flag);



				wake_up(&tscm->hwdep_wait);

			}

sound/pci/hda/hda_intel.c

+8 −5
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static char *patch[SNDRV_CARDS]; 
static bool beep_mode[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] =

					CONFIG_SND_HDA_INPUT_BEEP_MODE};

#endif

static bool dsp_driver = 1;

static bool dmic_detect = 1;



module_param_array(index, int, NULL, 0444);

MODULE_PARM_DESC(index, "Index value for Intel HD audio interface.");
@@ -160,9 +160,10 @@ module_param_array(beep_mode, bool, NULL, 0444); 
MODULE_PARM_DESC(beep_mode, "Select HDA Beep registration mode "

			    "(0=off, 1=on) (default=1).");

#endif

module_param(dsp_driver, bool, 0444);

MODULE_PARM_DESC(dsp_driver, "Allow DSP driver selection (bypass this driver) "

			     "(0=off, 1=on) (default=1)");

module_param(dmic_detect, bool, 0444);

MODULE_PARM_DESC(dmic_detect, "Allow DSP driver selection (bypass this driver) "

			     "(0=off, 1=on) (default=1); "

		 "deprecated, use snd-intel-dspcfg.dsp_driver option instead");



#ifdef CONFIG_PM

static int param_set_xint(const char *val, const struct kernel_param *kp);
@@ -2099,11 +2100,13 @@ static int azx_probe(struct pci_dev *pci, 
	/*

	 * stop probe if another Intel's DSP driver should be activated

	 */

	if (dsp_driver) {

	if (dmic_detect) {

		err = snd_intel_dsp_driver_probe(pci);

		if (err != SND_INTEL_DSP_DRIVER_ANY &&

		    err != SND_INTEL_DSP_DRIVER_LEGACY)

			return -ENODEV;

	} else {

		dev_warn(&pci->dev, "dmic_detect option is deprecated, pass snd-intel-dspcfg.dsp_driver=1 option instead\n");

	}



	err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,

sound/soc/codecs/cros_ec_codec.c

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <crypto/hash.h>

#include <crypto/sha.h>

#include <linux/acpi.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/io.h>
@@ -1047,10 +1048,17 @@ static const struct of_device_id cros_ec_codec_of_match[] = { 
MODULE_DEVICE_TABLE(of, cros_ec_codec_of_match);

#endif



static const struct acpi_device_id cros_ec_codec_acpi_id[] = {

	{ "GOOG0013", 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, cros_ec_codec_acpi_id);



static struct platform_driver cros_ec_codec_platform_driver = {

	.driver = {

		.name = "cros-ec-codec",

		.of_match_table = of_match_ptr(cros_ec_codec_of_match),

		.acpi_match_table = ACPI_PTR(cros_ec_codec_acpi_id),

	},

	.probe = cros_ec_codec_platform_probe,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE