Merge branch 'for-linus' into for-next (fce762ed) · Commits · e / devices / android_kernel_xiaomi_markw

sound/core/pcm.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ static struct snd_pcm snd_pcm_get(struct snd_card card, int device)
		struct snd_pcm *pcm;

		list_for_each_entry(pcm, &snd_pcm_devices, list) {
		if (pcm->internal)
		continue;
		if (pcm->card == card && pcm->device == device)
		return pcm;
		}
		@@ -60,6 +62,8 @@ static int snd_pcm_next(struct snd_card *card, int device)
		struct snd_pcm *pcm;

		list_for_each_entry(pcm, &snd_pcm_devices, list) {
		if (pcm->internal)
		continue;
		if (pcm->card == card && pcm->device > device)
		return pcm->device;
		else if (pcm->card->number > card->number)