diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-02 14:20:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-02 14:23:05 +0200 |
| commit | 9a83b7453c2c4db145666b653abe9d9f410d18a2 (patch) | |
| tree | fd750ef7e584eadf97411a40b413a3118a1817a1 /sound | |
| parent | 3218911f839b6c85acbf872ad264ea69aa4d89ad (diff) | |
| download | kernel_samsung_espresso10-9a83b7453c2c4db145666b653abe9d9f410d18a2.zip kernel_samsung_espresso10-9a83b7453c2c4db145666b653abe9d9f410d18a2.tar.gz kernel_samsung_espresso10-9a83b7453c2c4db145666b653abe9d9f410d18a2.tar.bz2 | |
ALSA: Remove invalid GENERIC_MIX PCM sublass
SNDRV_PCM_SUBCLASS_GENERIC_MIX is mostly for h/w multi-stream playback
devices, but ca0106 and emu10k1x don't support it (unlike emu10k1).
We shouldn't set that flag to avoid confusion.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 1 | ||||
| -rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index bfac30f..57b992a 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) } 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; diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 1970f0e..4d3ad79 100644 --- 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"); |