Merge branch 'topic/pcm-subclass-fix' into for-linus

* topic/pcm-subclass-fix: ALSA: Remove invalid GENERIC_MIX PCM sublass

Merge branch 'topic/pcm-subclass-fix' into for-linus
* topic/pcm-subclass-fix: ALSA: Remove invalid GENERIC_MIX PCM sublass
4ad75433 · Takashi Iwai · 3b88bc52 · 9a83b745 · 4ad75433 · 4ad75433
显示空白变更内容
内联并排

Showing with 0 addition and 2 deletion

sound/pci/ca0106/ca0106_main.c sound/pci/ca0106/ca0106_main.c +0 -1

sound/pci/emu10k1/emu10k1x.c sound/pci/emu10k1/emu10k1x.c +0 -1

未找到文件。
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -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; 

--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -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");