Merge branch 'for-linus' into for-next

fce762ed · Takashi Iwai · ebfe1068 · a4461f41 · fce762ed
Commit fce762ed authored Nov 04, 2013 by Takashi Iwai
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

sound/core/pcm.c sound/core/pcm.c +4 -0

No files found.
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -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)