Merge branch 'for-linus' into for-next · tjh.dev/kernel@fce762e

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

Merge branch 'for-linus' into for-next

Takashi Iwai 12 years ago fce762ed ebfe1068

1 changed file

expand all

sound

core

pcm.c

sound/core/pcm.c

··· 49 49 struct snd_pcm *pcm; 50 50 51 51 list_for_each_entry(pcm, &snd_pcm_devices, list) { 52 + if (pcm->internal) 53 + continue; 52 54 if (pcm->card == card && pcm->device == device) 53 55 return pcm; 54 56 } ··· 62 60 struct snd_pcm *pcm; 63 61 64 62 list_for_each_entry(pcm, &snd_pcm_devices, list) { 63 + if (pcm->internal) 64 + continue; 65 65 if (pcm->card == card && pcm->device > device) 66 66 return pcm->device; 67 67 else if (pcm->card->number > card->number)