Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a963203c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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
parents 1d479f89 c4865679

sound/pci/ca0106/ca0106_mixer.c

+9 −1
Original line number Diff line number Diff line
@@ -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;

}