Merge branch 'for-linus' into for-next

1 files changed, 4 insertions, 0 deletions

diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 17f45e8aa89c..e1e9e0c999fe 100644
--- 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)