aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ca0106
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:43 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:43 -0400
commit4ad75433c2a8a2eab16b077456202815adc536f9 (patch)
treecbc67cd585f02446c4204b67712da6e2f108498d /sound/pci/ca0106
parent3b88bc522986ae853670fcba71bb3761c84f7867 (diff)
parent9a83b7453c2c4db145666b653abe9d9f410d18a2 (diff)
Merge branch 'topic/pcm-subclass-fix' into for-linus
* topic/pcm-subclass-fix: ALSA: Remove invalid GENERIC_MIX PCM sublass
Diffstat (limited to 'sound/pci/ca0106')
-rw-r--r--sound/pci/ca0106/ca0106_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index bfac30f7929f..57b992a5c057 100644
--- 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)
1319 } 1319 }
1320 1320
1321 pcm->info_flags = 0; 1321 pcm->info_flags = 0;
1322 pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
1323 strcpy(pcm->name, "CA0106"); 1322 strcpy(pcm->name, "CA0106");
1324 1323
1325 for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; 1324 for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;