Merge branch 'fix/hda' into topic/hda

18 files changed, 66 insertions, 27 deletions

diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 6704acbca8c0..bd510eceff1f 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1927,9 +1927,9 @@ static int snd_ac97_dev_register(struct snd_device *device)
         ac97->dev.bus = &ac97_bus_type;
         ac97->dev.parent = ac97->bus->card->dev;
         ac97->dev.release = ac97_device_release;
-        snprintf(ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s",
-                 ac97->bus->card->number, ac97->num,
-                 snd_ac97_get_short_name(ac97));
+        dev_set_name(&ac97->dev, "%d-%d:%s",
+                     ac97->bus->card->number, ac97->num,
+                     snd_ac97_get_short_name(ac97));
         if ((err = device_register(&ac97->dev)) < 0) {
                 snd_printk(KERN_ERR "Can't register ac97 bus\n");
                 ac97->dev.bus = NULL;
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 6ce3cbe98a6a..6e831aff1bd0 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -476,7 +476,7 @@ static int patch_yamaha_ymf753(struct snd_ac97 * ac97)
 }
 
 /*
- * May 2, 2003 Liam Girdwood <liam.girdwood@wolfsonmicro.com>
+ * May 2, 2003 Liam Girdwood <lrg@slimlogic.co.uk>
  *  removed broken wolfson00 patch.
  *  added support for WM9705,WM9708,WM9709,WM9710,WM9711,WM9712 and WM9717.
  */
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 92f3a976ef2e..a7f38e63303f 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -932,7 +932,7 @@ snd_ad1889_create(struct snd_card *card,
                 goto free_and_ret;
 
         chip->bar = pci_resource_start(pci, 0);
-        chip->iobase = ioremap_nocache(chip->bar, pci_resource_len(pci, 0));
+        chip->iobase = pci_ioremap_bar(pci, 0);
         if (chip->iobase == NULL) {
                 printk(KERN_ERR PFX "unable to reserve region.\n");
                 err = -EBUSY;
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 085a52b8c807..226fe8237d31 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1609,7 +1609,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
                 return err;
         }
         chip->addr = pci_resource_start(pci, 0);
-        chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0));
+        chip->remap_addr = pci_ioremap_bar(pci, 0);
         if (chip->remap_addr == NULL) {
                 snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
                 snd_atiixp_free(chip);
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 2f106306c7fe..0e6e5cc1c501 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1252,7 +1252,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
                 return err;
         }
         chip->addr = pci_resource_start(pci, 0);
-        chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0));
+        chip->remap_addr = pci_ioremap_bar(pci, 0);
         if (chip->remap_addr == NULL) {
                 snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
                 snd_atiixp_free(chip);
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 68368e490074..a36d4d1fd419 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -180,8 +180,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
         if ((err = pci_request_regions(pci, CARD_NAME_SHORT)) != 0)
                 goto regions_out;
 
-        chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),
-                                     pci_resource_len(pci, 0));
+        chip->mmio = pci_ioremap_bar(pci, 0);
         if (!chip->mmio) {
                 printk(KERN_ERR "MMIO area remap failed.\n");
                 err = -ENOMEM;
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 3aa8d973540a..1aa1c0402540 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -749,8 +749,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
                 pci_disable_device(pci);
                 return err;
         }
-        chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),
-                                     pci_resource_len(pci, 0));
+        chip->mmio = pci_ioremap_bar(pci, 0);
         if (!chip->mmio) {
                 snd_printk(KERN_ERR "cannot remap io memory\n");
                 err = -ENOMEM;
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index a7d89662acf6..88fbf285d2b7 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -759,7 +759,6 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)
                                SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
                                SPCS_GENERATIONSTATUS | 0x00001200 |
                                0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT );
-        }
 #endif
 
         return 0;
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index ef9308f7c45b..192e7842e181 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1382,8 +1382,8 @@ static int __devinit snd_cs4281_create(struct snd_card *card,
         chip->ba0_addr = pci_resource_start(pci, 0);
         chip->ba1_addr = pci_resource_start(pci, 1);
 
-        chip->ba0 = ioremap_nocache(chip->ba0_addr, pci_resource_len(pci, 0));
-        chip->ba1 = ioremap_nocache(chip->ba1_addr, pci_resource_len(pci, 1));
+        chip->ba0 = pci_ioremap_bar(pci, 0);
+        chip->ba1 = pci_ioremap_bar(pci, 1);
         if (!chip->ba0 || !chip->ba1) {
                 snd_cs4281_free(chip);
                 return -ENOMEM;
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index 7ff8b68e997e..6dea5b5cc774 100644
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -2,7 +2,7 @@
  * cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio
  *
  *      (C) Copyright 2007 Ash Willis <ashwillis@programmer.net>
- *      (C) Copyright 2003 Red Hat Inc <alan@redhat.com>
+ *      (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>
  *
  * This driver was ported (shamelessly ripped ;) from oss/kahlua.c but I did
  * mess with it a bit. The chip seems to have to have trouble with full duplex
@@ -132,7 +132,7 @@ static int __devinit snd_cs5530_create(struct snd_card *card,
         }
         chip->pci_base = pci_resource_start(pci, 0);
 
-        mem = ioremap_nocache(chip->pci_base, pci_resource_len(pci, 0));
+        mem = pci_ioremap_bar(pci, 0);
         if (mem == NULL) {
                 kfree(chip);
                 pci_disable_device(pci);
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 2f283ea6ad9a..de5ee8f097f6 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1464,6 +1464,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .ca0151_chip = 1,
          .spk71 = 1,
          .spdif_bug = 1,
+         .invert_shared_spdif = 1,      /* digital/analog switch swapped */
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102,
          .driver = "Audigy2", .name = "Audigy 2 ZS [SB0350]", 
@@ -1473,6 +1474,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .ca0151_chip = 1,
          .spk71 = 1,
          .spdif_bug = 1,
+         .invert_shared_spdif = 1,      /* digital/analog switch swapped */
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102,
          .driver = "Audigy2", .name = "Audigy 2 ZS [2001]", 
@@ -1482,6 +1484,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .ca0151_chip = 1,
          .spk71 = 1,
          .spdif_bug = 1,
+         .invert_shared_spdif = 1,      /* digital/analog switch swapped */
          .ac97_chip = 1} ,
         /* Audigy 2 */
         /* Tested by James@superbug.co.uk 3rd July 2005 */
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index f2337e4eddda..a26ae8c4cf70 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2182,7 +2182,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         }
 
         chip->addr = pci_resource_start(pci, 0);
-        chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci,0));
+        chip->remap_addr = pci_ioremap_bar(pci, 0);
         if (chip->remap_addr == NULL) {
                 snd_printk(KERN_ERR SFX "ioremap error\n");
                 err = -ENXIO;
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 4c851fd55565..71c3ccfcde16 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -69,6 +69,7 @@ enum {
 };
 
 enum {
+        STAC_92HD73XX_NO_JD, /* no jack-detection */
         STAC_92HD73XX_REF,
         STAC_DELL_M6_AMIC,
         STAC_DELL_M6_DMIC,
@@ -127,6 +128,7 @@ enum {
 };
 
 enum {
+        STAC_D965_REF_NO_JD, /* no jack-detection */
         STAC_D965_REF,
         STAC_D965_3ST,
         STAC_D965_5ST,
@@ -1664,6 +1666,7 @@ static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
 };
 
 static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
+        [STAC_92HD73XX_NO_JD] = "no-jd",
         [STAC_92HD73XX_REF] = "ref",
         [STAC_DELL_M6_AMIC] = "dell-m6-amic",
         [STAC_DELL_M6_DMIC] = "dell-m6-dmic",
@@ -1693,6 +1696,8 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
                                 "unknown Dell", STAC_DELL_M6_DMIC),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f,
                                 "Dell Studio 1537", STAC_DELL_M6_DMIC),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0,
+                                "Dell Studio 17", STAC_DELL_M6_DMIC),
         {} /* terminator */
 };
 
@@ -2080,6 +2085,7 @@ static unsigned int dell_3st_pin_configs[14] = {
 };
 
 static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
+        [STAC_D965_REF_NO_JD] = ref927x_pin_configs,
         [STAC_D965_REF]  = ref927x_pin_configs,
         [STAC_D965_3ST]  = d965_3st_pin_configs,
         [STAC_D965_5ST]  = d965_5st_pin_configs,
@@ -2088,6 +2094,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
 };
 
 static const char *stac927x_models[STAC_927X_MODELS] = {
+        [STAC_D965_REF_NO_JD]   = "ref-no-jd",
         [STAC_D965_REF]         = "ref",
         [STAC_D965_3ST]         = "3stack",
         [STAC_D965_5ST]         = "5stack",
@@ -4545,14 +4552,17 @@ again:
 
         switch (spec->multiout.num_dacs) {
         case 0x3: /* 6 Channel */
+                spec->multiout.hp_nid = 0x17;
                 spec->mixer = stac92hd73xx_6ch_mixer;
                 spec->init = stac92hd73xx_6ch_core_init;
                 break;
         case 0x4: /* 8 Channel */
+                spec->multiout.hp_nid = 0x18;
                 spec->mixer = stac92hd73xx_8ch_mixer;
                 spec->init = stac92hd73xx_8ch_core_init;
                 break;
         case 0x5: /* 10 Channel */
+                spec->multiout.hp_nid = 0x19;
                 spec->mixer = stac92hd73xx_10ch_mixer;
                 spec->init = stac92hd73xx_10ch_core_init;
         };
@@ -4642,6 +4652,9 @@ again:
                 return err;
         }
 
+        if (spec->board_config == STAC_92HD73XX_NO_JD)
+                spec->hp_detect = 0;
+
         codec->patch_ops = stac92xx_patch_ops;
 
         codec->proc_widget_hook = stac92hd7x_proc_hook;
@@ -5138,6 +5151,10 @@ static int patch_stac927x(struct hda_codec *codec)
          */
         codec->bus->needs_damn_long_delay = 1;
 
+        /* no jack detecion for ref-no-jd model */
+        if (spec->board_config == STAC_D965_REF_NO_JD)
+                spec->hp_detect = 0;
+
         return 0;
 }
 
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 5b442383fcda..58d7cda03de5 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2688,12 +2688,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                 return err;
         }
 
-        if (ice_has_con_ac97(ice))
+        if (ice_has_con_ac97(ice)) {
                 err = snd_ice1712_pcm(ice, pcm_dev++, NULL);
                 if (err < 0) {
                         snd_card_free(card);
                         return err;
                 }
+        }
 
         err = snd_ice1712_ac97_mixer(ice);
         if (err < 0) {
@@ -2715,12 +2716,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                 }
         }
 
-        if (ice_has_con_ac97(ice))
+        if (ice_has_con_ac97(ice)) {
                 err = snd_ice1712_pcm_ds(ice, pcm_dev++, NULL);
                 if (err < 0) {
                         snd_card_free(card);
                         return err;
                 }
+        }
 
         if (!c->no_mpu401) {
                 err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712,
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index c88d1eace1c4..19d3391e229f 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2702,6 +2702,7 @@ static struct snd_pci_quirk intel8x0_clock_list[] __devinitdata = {
         SND_PCI_QUIRK(0x0e11, 0x008a, "AD1885", 41000),
         SND_PCI_QUIRK(0x1028, 0x00be, "AD1885", 44100),
         SND_PCI_QUIRK(0x1028, 0x0177, "AD1980", 48000),
+        SND_PCI_QUIRK(0x1028, 0x01ad, "AD1981B", 48000),
         SND_PCI_QUIRK(0x1043, 0x80f3, "AD1985", 48000),
         { }     /* terminator */
 };
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 2d0dce649a64..ae7601f353a7 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1314,8 +1314,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
         }
         for (i = 0; i < 2; i++) {
                 mgr->mem[i].phys = pci_resource_start(pci, i);
-                mgr->mem[i].virt = ioremap_nocache(mgr->mem[i].phys,
-                                                   pci_resource_len(pci, i));
+                mgr->mem[i].virt = pci_ioremap_bar(pci, i);
                 if (!mgr->mem[i].virt) {
                         printk(KERN_ERR "unable to remap resource 0x%lx\n",
                                mgr->mem[i].phys);
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 0e06c6c9fcc0..73de6e989b3d 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1229,8 +1229,11 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, const struct pci_device_id
                 return -ENOMEM;
         }
 
-        if (snd_BUG_ON(pci_id->driver_data >= PCI_ID_LAST))
+        if (snd_BUG_ON(pci_id->driver_data >= PCI_ID_LAST)) {
+                kfree(mgr);
+                pci_disable_device(pci);
                 return -ENODEV;
+        }
         card_name = pcxhr_board_params[pci_id->driver_data].board_name;
         mgr->playback_chips = pcxhr_board_params[pci_id->driver_data].playback_chips;
         mgr->capture_chips  = pcxhr_board_params[pci_id->driver_data].capture_chips;
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index d723543beadd..736246f98acc 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -4548,11 +4548,20 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
 {
         struct hdsp *hdsp = (struct hdsp *)hw->private_data;    
         void __user *argp = (void __user *)arg;
+        int err;
 
         switch (cmd) {
         case SNDRV_HDSP_IOCTL_GET_PEAK_RMS: {
                 struct hdsp_peak_rms __user *peak_rms = (struct hdsp_peak_rms __user *)arg;
 
+                err = hdsp_check_for_iobox(hdsp);
+                if (err < 0)
+                        return err;
+
+                err = hdsp_check_for_firmware(hdsp, 1);
+                if (err < 0)
+                        return err;
+
                 if (!(hdsp->state & HDSP_FirmwareLoaded)) {
                         snd_printk(KERN_ERR "Hammerfall-DSP: firmware needs to be uploaded to the card.\n");
                         return -EINVAL;
@@ -4572,10 +4581,14 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
                 unsigned long flags;
                 int i;
                 
-                if (!(hdsp->state & HDSP_FirmwareLoaded)) {
-                        snd_printk(KERN_ERR "Hammerfall-DSP: Firmware needs to be uploaded to the card.\n");    
-                        return -EINVAL;
-                }
+                err = hdsp_check_for_iobox(hdsp);
+                if (err < 0)
+                        return err;
+
+                err = hdsp_check_for_firmware(hdsp, 1);
+                if (err < 0)
+                        return err;
+
                 spin_lock_irqsave(&hdsp->lock, flags);
                 info.pref_sync_ref = (unsigned char)hdsp_pref_sync_ref(hdsp);
                 info.wordclock_sync_check = (unsigned char)hdsp_wc_sync_check(hdsp);
@@ -5045,6 +5058,10 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
                 /* we wait 2 seconds to let freshly inserted cardbus cards do their hardware init */
                 ssleep(2);
 
+                err = hdsp_check_for_iobox(hdsp);
+                if (err < 0)
+                        return err;
+
                 if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) {
 #ifdef HDSP_FW_LOADER
                         if ((err = hdsp_request_fw_loader(hdsp)) < 0)
@@ -5057,7 +5074,7 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
                                 /* init is complete, we return */
                                 return 0;
 #endif
-                        /* no iobox connected, we defer initialization */
+                        /* we defer initialization */
                         snd_printk(KERN_INFO "Hammerfall-DSP: card initialization pending : waiting for firmware\n");
                         if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0)
                                 return err;