diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-04 10:10:02 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-11-04 10:10:02 +0100 |
| commit | fce762ed9ffa0192d8f77f60d98f84b4cfbe4517 (patch) | |
| tree | 993c8a2bd09bbc7c7e76e25d578972e16489db3d /sound/core | |
| parent | Merge tag 'asoc-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
| parent | ALSA: fix oops in snd_pcm_info() caused by ASoC DPCM (diff) | |
| download | linux-fce762ed9ffa0192d8f77f60d98f84b4cfbe4517.tar.xz linux-fce762ed9ffa0192d8f77f60d98f84b4cfbe4517.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm.c | 4 |
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) |