Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

10 files changed, 92 insertions, 26 deletions

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index c9a2421cf6f0..4ecdd635ed1d 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -681,15 +681,12 @@ static struct snd_kcontrol_new snd_bt87x_capture_source = {
 
 static int snd_bt87x_free(struct snd_bt87x *chip)
 {
-        if (chip->mmio) {
+        if (chip->mmio)
                 snd_bt87x_stop(chip);
-                if (chip->irq >= 0)
-                        synchronize_irq(chip->irq);
-
-                iounmap(chip->mmio);
-        }
         if (chip->irq >= 0)
                 free_irq(chip->irq, chip);
+        if (chip->mmio)
+                iounmap(chip->mmio);
         pci_release_regions(chip->pci);
         pci_disable_device(chip->pci);
         kfree(chip);
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 26812dc2b7f2..37c413923db8 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1055,6 +1055,12 @@ int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
         const char **s;
         int err;
 
+        for (s = slaves; *s && !snd_hda_find_mixer_ctl(codec, *s); s++)
+                ;
+        if (!*s) {
+                snd_printdd("No slave found for %s\n", name);
+                return 0;
+        }
         kctl = snd_ctl_make_virtual_master(name, tlv);
         if (!kctl)
                 return -ENOMEM;
@@ -1197,8 +1203,8 @@ int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
         struct hda_bind_ctls *c;
         int err;
 
-        c = (struct hda_bind_ctls *)kcontrol->private_value;
         mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        c = (struct hda_bind_ctls *)kcontrol->private_value;
         kcontrol->private_value = *c->values;
         err = c->ops->info(kcontrol, uinfo);
         kcontrol->private_value = (long)c;
@@ -1213,8 +1219,8 @@ int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,
         struct hda_bind_ctls *c;
         int err;
 
-        c = (struct hda_bind_ctls *)kcontrol->private_value;
         mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        c = (struct hda_bind_ctls *)kcontrol->private_value;
         kcontrol->private_value = *c->values;
         err = c->ops->get(kcontrol, ucontrol);
         kcontrol->private_value = (long)c;
@@ -1230,8 +1236,8 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
         unsigned long *vals;
         int err = 0, change = 0;
 
-        c = (struct hda_bind_ctls *)kcontrol->private_value;
         mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        c = (struct hda_bind_ctls *)kcontrol->private_value;
         for (vals = c->values; *vals; vals++) {
                 kcontrol->private_value = *vals;
                 err = c->ops->put(kcontrol, ucontrol);
@@ -1251,8 +1257,8 @@ int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag,
         struct hda_bind_ctls *c;
         int err;
 
-        c = (struct hda_bind_ctls *)kcontrol->private_value;
         mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        c = (struct hda_bind_ctls *)kcontrol->private_value;
         kcontrol->private_value = *c->values;
         err = c->ops->tlv(kcontrol, op_flag, size, tlv);
         kcontrol->private_value = (long)c;
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 56f8a3050751..4be36c84b36c 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -275,6 +275,11 @@ enum {
 #define NVIDIA_HDA_TRANSREG_ADDR      0x4e
 #define NVIDIA_HDA_ENABLE_COHBITS     0x0f
 
+/* Defines for Intel SCH HDA snoop control */
+#define INTEL_SCH_HDA_DEVC      0x78
+#define INTEL_SCH_HDA_DEVC_NOSNOOP       (0x1<<11)
+
+
 /*
  */
 
@@ -868,6 +873,8 @@ static void update_pci_byte(struct pci_dev *pci, unsigned int reg,
 
 static void azx_init_pci(struct azx *chip)
 {
+        unsigned short snoop;
+
         /* Clear bits 0-2 of PCI register TCSEL (at offset 0x44)
          * TCSEL == Traffic Class Select Register, which sets PCI express QOS
          * Ensuring these bits are 0 clears playback static on some HD Audio
@@ -888,6 +895,19 @@ static void azx_init_pci(struct azx *chip)
                                 NVIDIA_HDA_TRANSREG_ADDR,
                                 0x0f, NVIDIA_HDA_ENABLE_COHBITS);
                 break;
+        case AZX_DRIVER_SCH:
+                pci_read_config_word(chip->pci, INTEL_SCH_HDA_DEVC, &snoop);
+                if (snoop & INTEL_SCH_HDA_DEVC_NOSNOOP) {
+                        pci_write_config_word(chip->pci, INTEL_SCH_HDA_DEVC, \
+                                snoop & (~INTEL_SCH_HDA_DEVC_NOSNOOP));
+                        pci_read_config_word(chip->pci,
+                                INTEL_SCH_HDA_DEVC, &snoop);
+                        snd_printdd("HDA snoop disabled, enabling ... %s\n",\
+                                (snoop & INTEL_SCH_HDA_DEVC_NOSNOOP) \
+                                ? "Failed" : "OK");
+                }
+                break;
+
         }
 }
 
@@ -1040,6 +1060,7 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
 
 static unsigned int azx_max_codecs[] __devinitdata = {
         [AZX_DRIVER_ICH] = 3,
+        [AZX_DRIVER_SCH] = 3,
         [AZX_DRIVER_ATI] = 4,
         [AZX_DRIVER_ATIHDMI] = 4,
         [AZX_DRIVER_VIA] = 3,           /* FIXME: correct? */
@@ -1797,7 +1818,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
                  */
                 chip->playback_streams = (gcap & (0xF << 12)) >> 12;
                 chip->capture_streams = (gcap & (0xF << 8)) >> 8;
-                chip->playback_index_offset = (gcap & (0xF << 12)) >> 12;
+                chip->playback_index_offset = chip->capture_streams;
                 chip->capture_index_offset = 0;
         } else {
                 /* gcap didn't give any info, switching to old method */
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 35a630d1770f..5633f77f8f3b 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -584,7 +584,8 @@ static void print_codec_info(struct snd_info_entry *entry,
                         print_amp_caps(buffer, codec, nid, HDA_INPUT);
                         snd_iprintf(buffer, "  Amp-In vals: ");
                         print_amp_vals(buffer, codec, nid, HDA_INPUT,
-                                       wid_caps & AC_WCAP_STEREO, conn_len);
+                                       wid_caps & AC_WCAP_STEREO,
+                                       wid_type == AC_WID_PIN ? 1 : conn_len);
                 }
                 if (wid_caps & AC_WCAP_OUT_AMP) {
                         snd_iprintf(buffer, "  Amp-Out caps: ");
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index f6dd51cda7b2..f7cd3a804b11 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -488,7 +488,7 @@ static int conexant_ch_mode_put(struct snd_kcontrol *kcontrol,
 static hda_nid_t cxt5045_dac_nids[1] = { 0x19 };
 static hda_nid_t cxt5045_adc_nids[1] = { 0x1a };
 static hda_nid_t cxt5045_capsrc_nids[1] = { 0x1a };
-#define CXT5045_SPDIF_OUT       0x13
+#define CXT5045_SPDIF_OUT       0x18
 
 static struct hda_channel_mode cxt5045_modes[1] = {
         { 2, NULL },
@@ -658,6 +658,7 @@ static struct hda_verb cxt5045_init_verbs[] = {
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE,
          AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
         /* SPDIF route: PCM */
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         { 0x13, AC_VERB_SET_CONNECT_SEL, 0x0 },
         /* EAPD */
         {0x10, AC_VERB_SET_EAPD_BTLENABLE, 0x2 }, /* default on */ 
@@ -683,6 +684,7 @@ static struct hda_verb cxt5045_benq_init_verbs[] = {
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE,
          AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
         /* SPDIF route: PCM */
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
         /* EAPD */
         {0x10, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
@@ -781,7 +783,8 @@ static struct hda_verb cxt5045_test_init_verbs[] = {
          * PCM format, copyright asserted, no pre-emphasis and no validity
          * control.
          */
-        {0x13, AC_VERB_SET_DIGI_CONVERT_1, 0},
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x18, AC_VERB_SET_DIGI_CONVERT_1, 0},
 
         /* Start with output sum widgets muted and their output gains at min */
         {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 586d98f1b63d..777f8c01ca7a 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5227,10 +5227,14 @@ static int alc882_mux_enum_put(struct snd_kcontrol *kcontrol,
         const struct hda_input_mux *imux = spec->input_mux;
         unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
         static hda_nid_t capture_mixers[3] = { 0x24, 0x23, 0x22 };
-        hda_nid_t nid = capture_mixers[adc_idx];
+        hda_nid_t nid;
         unsigned int *cur_val = &spec->cur_mux[adc_idx];
         unsigned int i, idx;
 
+        if (spec->num_adc_nids < 3)
+                nid = capture_mixers[adc_idx + 1];
+        else
+                nid = capture_mixers[adc_idx];
         idx = ucontrol->value.enumerated.item[0];
         if (idx >= imux->num_items)
                 idx = imux->num_items - 1;
@@ -6457,7 +6461,7 @@ static int alc883_mux_enum_put(struct snd_kcontrol *kcontrol,
         struct alc_spec *spec = codec->spec;
         const struct hda_input_mux *imux = spec->input_mux;
         unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-        static hda_nid_t capture_mixers[3] = { 0x24, 0x23, 0x22 };
+        static hda_nid_t capture_mixers[2] = { 0x23, 0x22 };
         hda_nid_t nid = capture_mixers[adc_idx];
         unsigned int *cur_val = &spec->cur_mux[adc_idx];
         unsigned int i, idx;
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index f31a0eb409b0..9a9941bb0460 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -28,7 +28,9 @@
  * GPIO 1 -> DFS1 of AK5385
  */
 
+#include <linux/mutex.h>
 #include <linux/pci.h>
+#include <sound/ac97_codec.h>
 #include <sound/control.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -37,6 +39,7 @@
 #include <sound/tlv.h>
 #include "oxygen.h"
 #include "ak4396.h"
+#include "cm9780.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("C-Media CMI8788 driver");
@@ -75,6 +78,8 @@ MODULE_DEVICE_TABLE(pci, oxygen_ids);
 #define GPIO_AK5385_DFS_DOUBLE  0x0001
 #define GPIO_AK5385_DFS_QUAD    0x0002
 
+#define GPIO_LINE_MUTE          CM9780_GPO0
+
 #define WM8785_R0       0
 #define WM8785_R1       1
 #define WM8785_R2       2
@@ -180,16 +185,23 @@ static void wm8785_init(struct oxygen *chip)
         snd_component_add(chip->card, "WM8785");
 }
 
+static void cmi9780_init(struct oxygen *chip)
+{
+        oxygen_ac97_clear_bits(chip, 0, CM9780_GPIO_STATUS, GPIO_LINE_MUTE);
+}
+
 static void generic_init(struct oxygen *chip)
 {
         ak4396_init(chip);
         wm8785_init(chip);
+        cmi9780_init(chip);
 }
 
 static void meridian_init(struct oxygen *chip)
 {
         ak4396_init(chip);
         ak5385_init(chip);
+        cmi9780_init(chip);
 }
 
 static void generic_cleanup(struct oxygen *chip)
@@ -285,6 +297,27 @@ static void set_ak5385_params(struct oxygen *chip,
                               value, GPIO_AK5385_DFS_MASK);
 }
 
+static void cmi9780_switch_hook(struct oxygen *chip, unsigned int codec,
+                                unsigned int reg, int mute)
+{
+        if (codec != 0)
+                return;
+        switch (reg) {
+        case AC97_LINE:
+                oxygen_write_ac97_masked(chip, 0, CM9780_GPIO_STATUS,
+                                         mute ? GPIO_LINE_MUTE : 0,
+                                         GPIO_LINE_MUTE);
+                break;
+        case AC97_MIC:
+        case AC97_CD:
+        case AC97_AUX:
+                if (!mute)
+                        oxygen_ac97_set_bits(chip, 0, CM9780_GPIO_STATUS,
+                                             GPIO_LINE_MUTE);
+                break;
+        }
+}
+
 static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
 
 static int ak4396_control_filter(struct snd_kcontrol_new *template)
@@ -308,6 +341,7 @@ static const struct oxygen_model model_generic = {
         .set_adc_params = set_wm8785_params,
         .update_dac_volume = update_ak4396_volume,
         .update_dac_mute = update_ak4396_mute,
+        .ac97_switch_hook = cmi9780_switch_hook,
         .model_data_size = sizeof(struct generic_data),
         .dac_channels = 8,
         .used_channels = OXYGEN_CHANNEL_A |
@@ -331,6 +365,7 @@ static const struct oxygen_model model_meridian = {
         .set_adc_params = set_ak5385_params,
         .update_dac_volume = update_ak4396_volume,
         .update_dac_mute = update_ak4396_mute,
+        .ac97_switch_hook = cmi9780_switch_hook,
         .model_data_size = sizeof(struct generic_data),
         .dac_channels = 8,
         .used_channels = OXYGEN_CHANNEL_B |
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 6eb36dd11476..78c21155218e 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -204,7 +204,7 @@ static void oxygen_proc_read(struct snd_info_entry *entry,
         mutex_unlock(&chip->mutex);
 }
 
-static void __devinit oxygen_proc_init(struct oxygen *chip)
+static void oxygen_proc_init(struct oxygen *chip)
 {
         struct snd_info_entry *entry;
 
@@ -215,7 +215,7 @@ static void __devinit oxygen_proc_init(struct oxygen *chip)
 #define oxygen_proc_init(chip)
 #endif
 
-static void __devinit oxygen_init(struct oxygen *chip)
+static void oxygen_init(struct oxygen *chip)
 {
         unsigned int i;
 
@@ -399,8 +399,8 @@ static void oxygen_card_free(struct snd_card *card)
         pci_disable_device(chip->pci);
 }
 
-int __devinit oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
-                               int midi, const struct oxygen_model *model)
+int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
+                     int midi, const struct oxygen_model *model)
 {
         struct snd_card *card;
         struct oxygen *chip;
@@ -507,7 +507,7 @@ err_card:
 }
 EXPORT_SYMBOL(oxygen_pci_probe);
 
-void __devexit oxygen_pci_remove(struct pci_dev *pci)
+void oxygen_pci_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
         pci_set_drvdata(pci, NULL);
diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c
index dfad3db35c82..b70046aca657 100644
--- a/sound/pci/oxygen/oxygen_pcm.c
+++ b/sound/pci/oxygen/oxygen_pcm.c
@@ -634,7 +634,7 @@ static void oxygen_pcm_free(struct snd_pcm *pcm)
         snd_pcm_lib_preallocate_free_for_all(pcm);
 }
 
-int __devinit oxygen_pcm_init(struct oxygen *chip)
+int oxygen_pcm_init(struct oxygen *chip)
 {
         struct snd_pcm *pcm;
         int outs, ins;
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index c2bd4384316a..1be84f22d0de 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -745,7 +745,7 @@ static int hdsp_get_iobox_version (struct hdsp *hdsp)
 
 
 #ifdef HDSP_FW_LOADER
-static int __devinit hdsp_request_fw_loader(struct hdsp *hdsp);
+static int hdsp_request_fw_loader(struct hdsp *hdsp);
 #endif
 
 static int hdsp_check_for_firmware (struct hdsp *hdsp, int load_on_demand)
@@ -4688,8 +4688,7 @@ static struct snd_pcm_ops snd_hdsp_capture_ops = {
         .copy =         snd_hdsp_capture_copy,
 };
 
-static int __devinit snd_hdsp_create_hwdep(struct snd_card *card,
-                                           struct hdsp *hdsp)
+static int snd_hdsp_create_hwdep(struct snd_card *card, struct hdsp *hdsp)
 {
         struct snd_hwdep *hw;
         int err;
@@ -4857,7 +4856,7 @@ static int snd_hdsp_create_alsa_devices(struct snd_card *card, struct hdsp *hdsp
 
 #ifdef HDSP_FW_LOADER
 /* load firmware via hotplug fw loader */
-static int __devinit hdsp_request_fw_loader(struct hdsp *hdsp)
+static int hdsp_request_fw_loader(struct hdsp *hdsp)
 {
         const char *fwfile;
         const struct firmware *fw;