aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ca0106/ca0106_mixer.c
diff options
context:
space:
mode:
authorAndy Owen <andy-alsa@ultra-premium.com>2010-10-23 07:12:32 -0400
committerTakashi Iwai <tiwai@suse.de>2010-10-23 10:59:40 -0400
commit6fef153afa8b25f81417488150e04db7c6b0b229 (patch)
tree84d03bfe267bf85eb80fedaa70823968840de7bf /sound/pci/ca0106/ca0106_mixer.c
parent861391d3a037fab38020c741baffdb147e1c732a (diff)
ALSA: ca0106: Allow different sound cards to use different SPI channel mappings.
Signed-off-by: Andy Owen <andy-alsa@ultra-premium.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ca0106/ca0106_mixer.c')
-rw-r--r--sound/pci/ca0106/ca0106_mixer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 85fd315d9999..b522401b0318 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -832,7 +832,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
832 if (err < 0) 832 if (err < 0)
833 return err; 833 return err;
834 } 834 }
835 if (emu->details->spi_dac == 1) 835 if (emu->details->spi_dac)
836 ADD_CTLS(emu, snd_ca0106_volume_spi_dac_ctls); 836 ADD_CTLS(emu, snd_ca0106_volume_spi_dac_ctls);
837 837
838 /* Create virtual master controls */ 838 /* Create virtual master controls */
@@ -845,7 +845,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
845 return err; 845 return err;
846 add_slaves(card, vmaster, slave_vols); 846 add_slaves(card, vmaster, slave_vols);
847 847
848 if (emu->details->spi_dac == 1) { 848 if (emu->details->spi_dac) {
849 vmaster = snd_ctl_make_virtual_master("Master Playback Switch", 849 vmaster = snd_ctl_make_virtual_master("Master Playback Switch",
850 NULL); 850 NULL);
851 if (!vmaster) 851 if (!vmaster)