Merge branch 'topic/pcm-subclass-fix' into for-linus
* topic/pcm-subclass-fix: ALSA: Remove invalid GENERIC_MIX PCM sublass
This commit is contained in:
Коммит
4ad75433c2
|
@ -1319,7 +1319,6 @@ static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device)
|
|||
}
|
||||
|
||||
pcm->info_flags = 0;
|
||||
pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
|
||||
strcpy(pcm->name, "CA0106");
|
||||
|
||||
for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
|
||||
|
|
|
@ -858,7 +858,6 @@ static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct s
|
|||
}
|
||||
|
||||
pcm->info_flags = 0;
|
||||
pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
|
||||
switch(device) {
|
||||
case 0:
|
||||
strcpy(pcm->name, "EMU10K1X Front");
|
||||
|
|
Загрузка…
Ссылка в новой задаче