Commit 4ad75433 authored by Takashi Iwai's avatar Takashi Iwai

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

* topic/pcm-subclass-fix:
  ALSA: Remove invalid GENERIC_MIX PCM sublass
parents 3b88bc52 9a83b745
...@@ -1319,7 +1319,6 @@ static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device) ...@@ -1319,7 +1319,6 @@ static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device)
} }
pcm->info_flags = 0; pcm->info_flags = 0;
pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
strcpy(pcm->name, "CA0106"); strcpy(pcm->name, "CA0106");
for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; 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 ...@@ -858,7 +858,6 @@ static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct s
} }
pcm->info_flags = 0; pcm->info_flags = 0;
pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
switch(device) { switch(device) {
case 0: case 0:
strcpy(pcm->name, "EMU10K1X Front"); strcpy(pcm->name, "EMU10K1X Front");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment