diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:22 +0200 |
| commit | a963203c18e5988506bd173b75ca002df528ed48 (patch) | |
| tree | 454d736eed6c5d6c398e0bd5b21e971f8f0ad77b /sound/pci | |
| parent | 1d479f89ec9f29df220bfa1af297ab2f35be1e30 (diff) | |
| parent | c4865679df5453d1bc94c534f4d94a364c0546df (diff) | |
| download | linux-stable-a963203c18e5988506bd173b75ca002df528ed48.tar.gz linux-stable-a963203c18e5988506bd173b75ca002df528ed48.tar.bz2 linux-stable-a963203c18e5988506bd173b75ca002df528ed48.zip | |
Merge branch 'topic/ca0106' into for-linus
* topic/ca0106:
ALSA: ca0106 - Fix master volume scale
ALSA: ca0106 - Add missing card->mixername field setup
ALSA: ca0106 - Add missing registrations of vmaster controls
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/ca0106/ca0106_mixer.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index c111efe61c3c..c8c6f437f5b3 100644 --- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c @@ -739,7 +739,7 @@ static int __devinit rename_ctl(struct snd_card *card, const char *src, const ch } while (0) static __devinitdata -DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 50, 1); +DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 25, 1); static char *slave_vols[] __devinitdata = { "Analog Front Playback Volume", @@ -841,6 +841,9 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) snd_ca0106_master_db_scale); if (!vmaster) return -ENOMEM; + err = snd_ctl_add(card, vmaster); + if (err < 0) + return err; add_slaves(card, vmaster, slave_vols); if (emu->details->spi_dac == 1) { @@ -848,8 +851,13 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) NULL); if (!vmaster) return -ENOMEM; + err = snd_ctl_add(card, vmaster); + if (err < 0) + return err; add_slaves(card, vmaster, slave_sws); } + + strcpy(card->mixername, "CA0106"); return 0; } |