Commit 8ac2a114 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "It became a bit largish, but all small and good for 5.4:

   - A regression fix of ALSA timer code bug that sneaked in by a recent
     cleanup; never trust innocent-looking guys...

   - Fix for compress API max size check signedness

   - Fixes in HD-audio: CA0132 work stall, Intel Tigerlake HDMI

   - A few fixes for SOF: memory leak, sanity-check and build fixes

   - A collection of device-specific fixes: firewire, rockchip, ASoC
     HDMI, rsnd, ASoC HDA, stm32, TI, kirkwood, msm, max98373"

* tag 'sound-5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: timer: Fix incorrectly assigned timer instance
  ASoC: SOF: topology: Fix bytes control size checks
  ALSA: hda: hdmi - add Tigerlake support
  ASoC: max98373: replace gpio_request with devm_gpio_request
  ASoC: stm32: sai: add restriction on mmap support
  ALSA: hda/ca0132 - Fix possible workqueue stall
  ASoC: hdac_hda: fix race in device removal
  ALSA: bebob: fix to detect configured source of sampling clock for Focusrite Saffire Pro i/o series
  ASoC: rockchip: rockchip_max98090: Enable SHDN to fix headset detection
  ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma names
  ASoC: SOF: ipc: Fix memory leak in sof_set_get_large_ctrl_data
  ASoC: SOF: Fix memory leak in sof_dfsentry_write
  ASoC: SOF: Intel: hda-stream: fix the CONFIG_ prefix missing
  ASoC: kirkwood: fix device remove ordering
  ASoC: rsnd: dma: fix SSI9 4/5/6/7 busif dma address
  ASoC: hdmi-codec: drop mutex locking again
  ASoC: kirkwood: fix external clock probe defer
  ASoC: compress: fix unsigned integer overflow check
  ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX
parents efc61f7c df37d941

sound/core/compress_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static int snd_compress_check_input(struct snd_compr_params *params) 
{

	/* first let's check the buffer parameter's */

	if (params->buffer.fragment_size == 0 ||

	    params->buffer.fragments > INT_MAX / params->buffer.fragment_size ||

	    params->buffer.fragments > U32_MAX / params->buffer.fragment_size ||

	    params->buffer.fragments == 0)

		return -EINVAL;

sound/core/timer.c

+3 −3
Original line number Diff line number Diff line
@@ -284,11 +284,11 @@ int snd_timer_open(struct snd_timer_instance **ti, 
		goto unlock;

	}

	if (!list_empty(&timer->open_list_head)) {

		timeri = list_entry(timer->open_list_head.next,

		struct snd_timer_instance *t =

			list_entry(timer->open_list_head.next,

				    struct snd_timer_instance, open_list);

		if (timeri->flags & SNDRV_TIMER_IFLG_EXCLUSIVE) {

		if (t->flags & SNDRV_TIMER_IFLG_EXCLUSIVE) {

			err = -EBUSY;

			timeri = NULL;

			goto unlock;

		}

	}

sound/firewire/bebob/bebob_focusrite.c

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#define SAFFIRE_CLOCK_SOURCE_SPDIF		1



/* clock sources as returned from register of Saffire Pro 10 and 26 */

#define SAFFIREPRO_CLOCK_SOURCE_SELECT_MASK	0x000000ff

#define SAFFIREPRO_CLOCK_SOURCE_DETECT_MASK	0x0000ff00

#define SAFFIREPRO_CLOCK_SOURCE_INTERNAL	0

#define SAFFIREPRO_CLOCK_SOURCE_SKIP		1 /* never used on hardware */

#define SAFFIREPRO_CLOCK_SOURCE_SPDIF		2
@@ -189,6 +191,7 @@ saffirepro_both_clk_src_get(struct snd_bebob *bebob, unsigned int *id) 
		map = saffirepro_clk_maps[1];



	/* In a case that this driver cannot handle the value of register. */

	value &= SAFFIREPRO_CLOCK_SOURCE_SELECT_MASK;

	if (value >= SAFFIREPRO_CLOCK_SOURCE_COUNT || map[value] < 0) {

		err = -EIO;

		goto end;

sound/pci/hda/patch_ca0132.c

+1 −1
Original line number Diff line number Diff line
@@ -7604,7 +7604,7 @@ static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb) 
	/* Delay enabling the HP amp, to let the mic-detection

	 * state machine run.

	 */

	cancel_delayed_work_sync(&spec->unsol_hp_work);

	cancel_delayed_work(&spec->unsol_hp_work);

	schedule_delayed_work(&spec->unsol_hp_work, msecs_to_jiffies(500));

	tbl = snd_hda_jack_tbl_get(codec, cb->nid);

	if (tbl)

sound/pci/hda/patch_hdmi.c

+13 −0
Original line number Diff line number Diff line
@@ -2851,6 +2851,18 @@ static int patch_i915_icl_hdmi(struct hda_codec *codec) 
	return intel_hsw_common_init(codec, 0x02, map, ARRAY_SIZE(map));

}



static int patch_i915_tgl_hdmi(struct hda_codec *codec)

{

	/*

	 * pin to port mapping table where the value indicate the pin number and

	 * the index indicate the port number with 1 base.

	 */

	static const int map[] = {0x4, 0x6, 0x8, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf};



	return intel_hsw_common_init(codec, 0x02, map, ARRAY_SIZE(map));

}





/* Intel Baytrail and Braswell; with eld notifier */

static int patch_i915_byt_hdmi(struct hda_codec *codec)

{
@@ -4153,6 +4165,7 @@ HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI", patch_i915_hsw_hdmi), 
HDA_CODEC_ENTRY(0x8086280c, "Cannonlake HDMI",	patch_i915_glk_hdmi),

HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI",	patch_i915_glk_hdmi),

HDA_CODEC_ENTRY(0x8086280f, "Icelake HDMI",	patch_i915_icl_hdmi),

HDA_CODEC_ENTRY(0x80862812, "Tigerlake HDMI",	patch_i915_tgl_hdmi),

HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI",	patch_generic_hdmi),

HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI",	patch_i915_byt_hdmi),

HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI",	patch_i915_byt_hdmi),

CRA Git | Maintained and supported by SUSTech CRA and CCSE