← Back to branch summary

~ubuntu-branches/ubuntu/precise/alsa-driver/precise

« back to all changes in this revision

Viewing changes to alsa-kernel/pci/ca0106/ca0106_mixer.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-11-04 16:28:58 UTC
  • mfrom: (1.1.12 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091104162858-7ky0tu33d7mn6oys
Tags: 1.0.21+dfsg-3ubuntu1
* Merge from debian unstable, remaining changes:
  - Script paths (/usr/sbin -> /sbin, /usr/bin -> /bin);
  - debian/rules:
    + Don't install snddevices and program-wrapper
    + install alsa-base apport hook
    + Package separate USB card list file
  - Vcs and maintainer fields mangling
  - Rename blacklist files in /etc/modprobe.d to be consistant with the rest
    of the distro
  - debian/alsa-base.init:
    + create /var/run/alsa if it doesn't exist
    + Run alsactl store before force unloading modules
    + Run alsactl restore after reloading unloaded modules
  - debian/linux-sound-base.postrm: Remove /etc/modprobe.d/blacklist* files
    on package removal
  - Add missing $CMDLINE_OPTS to all install rules.
  - Replace -Q with --quiet.
  - Add --use-blacklist to all rules so the blacklist still takes effect.
  - debian/alsa-base.postinst: Do not run snddevices
  - retain patches:
    + add_suspend_quirk_hp_nc6220_nw8240.patch,
    + refix_lp_68659_by_disabling_dxs_for_0x1458a002.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
alsa-kernel/pci/ca0106/ca0106_mixer.c
739
739
        } while (0)
740
740
 
741
741
static __devinitdata
742
 
DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 50, 1);
 
742
DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 25, 1);
743
743
 
744
744
static char *slave_vols[] __devinitdata = {
745
745
        "Analog Front Playback Volume",
800
800
                "Capture Volume",
801
801
                "External Amplifier",
802
802
                "Sigmatel 4-Speaker Stereo Playback Switch",
803
 
                "Sigmatel Surround Phase Inversion Playback ",
 
803
                "Surround Phase Inversion Playback Switch",
804
804
                NULL
805
805
        };
806
806
        static char *ca0106_rename_ctls[] = {
841
841
                                              snd_ca0106_master_db_scale);
842
842
        if (!vmaster)
843
843
                return -ENOMEM;
 
844
        err = snd_ctl_add(card, vmaster);
 
845
        if (err < 0)
 
846
                return err;
844
847
        add_slaves(card, vmaster, slave_vols);
845
848
 
846
849
        if (emu->details->spi_dac == 1) {
848
851
                                                      NULL);
849
852
                if (!vmaster)
850
853
                        return -ENOMEM;
 
854
                err = snd_ctl_add(card, vmaster);
 
855
                if (err < 0)
 
856
                        return err;
851
857
                add_slaves(card, vmaster, slave_sws);
852
858
        }
 
859
 
 
860
        strcpy(card->mixername, "CA0106");
853
861
        return 0;
854
862
}
855
863