Commit b12b2259 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 50952670 976a68f0

sound/core/pcm_lib.c

+6 −2
Original line number Diff line number Diff line
@@ -1782,11 +1782,14 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) 
	struct snd_pcm_runtime *runtime;

	unsigned long flags;



	if (PCM_RUNTIME_CHECK(substream))

	if (snd_BUG_ON(!substream))

		return;

	runtime = substream->runtime;



	snd_pcm_stream_lock_irqsave(substream, flags);

	if (PCM_RUNTIME_CHECK(substream))

		goto _unlock;

	runtime = substream->runtime;



	if (!snd_pcm_running(substream) ||

	    snd_pcm_update_hw_ptr0(substream, 1) < 0)

		goto _end;
@@ -1797,6 +1800,7 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) 
#endif

 _end:

	kill_fasync(&runtime->fasync, SIGIO, POLL_IN);

 _unlock:

	snd_pcm_stream_unlock_irqrestore(substream, flags);

}

EXPORT_SYMBOL(snd_pcm_period_elapsed);

sound/pci/hda/hda_intel.c

+3 −0
Original line number Diff line number Diff line
@@ -2386,6 +2386,9 @@ static const struct pci_device_id azx_ids[] = { 
	/* CometLake-H */

	{ PCI_DEVICE(0x8086, 0x06C8),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* CometLake-S */

	{ PCI_DEVICE(0x8086, 0xa3f0),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Icelake */

	{ PCI_DEVICE(0x8086, 0x34c8),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

sound/pci/hda/patch_hdmi.c

+3 −1
Original line number Diff line number Diff line
@@ -46,10 +46,12 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info"); 
				((codec)->core.vendor_id == 0x80862800))

#define is_cannonlake(codec) ((codec)->core.vendor_id == 0x8086280c)

#define is_icelake(codec) ((codec)->core.vendor_id == 0x8086280f)

#define is_tigerlake(codec) ((codec)->core.vendor_id == 0x80862812)

#define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \

				|| is_skylake(codec) || is_broxton(codec) \

				|| is_kabylake(codec) || is_geminilake(codec) \

				|| is_cannonlake(codec) || is_icelake(codec))

				|| is_cannonlake(codec) || is_icelake(codec) \

				|| is_tigerlake(codec))

#define is_valleyview(codec) ((codec)->core.vendor_id == 0x80862882)

#define is_cherryview(codec) ((codec)->core.vendor_id == 0x80862883)

#define is_valleyview_plus(codec) (is_valleyview(codec) || is_cherryview(codec))

sound/usb/endpoint.c

+3 −0
Original line number Diff line number Diff line
@@ -388,6 +388,9 @@ static void snd_complete_urb(struct urb *urb) 
		}



		prepare_outbound_urb(ep, ctx);

		/* can be stopped during prepare callback */

		if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags)))

			goto exit_clear;

	} else {

		retire_inbound_urb(ep, ctx);

		/* can be stopped during retire callback */

sound/usb/mixer.c

+3 −1
Original line number Diff line number Diff line
@@ -1229,7 +1229,8 @@ static int get_min_max_with_quirks(struct usb_mixer_elem_info *cval, 
		if (cval->min + cval->res < cval->max) {

			int last_valid_res = cval->res;

			int saved, test, check;

			get_cur_mix_raw(cval, minchn, &saved);

			if (get_cur_mix_raw(cval, minchn, &saved) < 0)

				goto no_res_check;

			for (;;) {

				test = saved;

				if (test < cval->max)
@@ -1249,6 +1250,7 @@ static int get_min_max_with_quirks(struct usb_mixer_elem_info *cval, 
			snd_usb_set_cur_mix_value(cval, minchn, 0, saved);

		}



no_res_check:

		cval->initialized = 1;

	}