2 files changed, 29 insertions, 17 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 6833835a218b..72b085ae7d46 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -501,6 +501,7 @@ struct azx {
 
         /* VGA-switcheroo setup */
         unsigned int use_vga_switcheroo:1;
+        unsigned int vga_switcheroo_registered:1;
         unsigned int init_failed:1; /* delayed init failed */
         unsigned int disabled:1; /* disabled by VGA-switcher */
 
@@ -2157,9 +2158,12 @@ static unsigned int azx_get_position(struct azx *chip,
                 if (delay < 0)
                         delay += azx_dev->bufsize;
                 if (delay >= azx_dev->period_bytes) {
-                        snd_printdd("delay %d > period_bytes %d\n",
-                                delay, azx_dev->period_bytes);
-                        delay = 0; /* something is wrong */
+                        snd_printk(KERN_WARNING SFX
+                                   "Unstable LPIB (%d >= %d); "
+                                   "disabling LPIB delay counting\n",
+                                   delay, azx_dev->period_bytes);
+                        delay = 0;
+                        chip->driver_caps &= ~AZX_DCAPS_COUNT_LPIB_DELAY;
                 }
                 azx_dev->substream->runtime->delay =
                         bytes_to_frames(azx_dev->substream->runtime, delay);
@@ -2640,7 +2644,9 @@ static void azx_vs_set_state(struct pci_dev *pci,
                 if (disabled) {
                         azx_suspend(&pci->dev);
                         chip->disabled = true;
-                        snd_hda_lock_devices(chip->bus);
+                        if (snd_hda_lock_devices(chip->bus))
+                                snd_printk(KERN_WARNING SFX
+                                           "Cannot lock devices!\n");
                 } else {
                         snd_hda_unlock_devices(chip->bus);
                         chip->disabled = false;
@@ -2683,14 +2689,20 @@ static const struct vga_switcheroo_client_ops azx_vs_ops = {
 
 static int __devinit register_vga_switcheroo(struct azx *chip)
 {
+        int err;
+
         if (!chip->use_vga_switcheroo)
                 return 0;
         /* FIXME: currently only handling DIS controller
          * is there any machine with two switchable HDMI audio controllers?
          */
-        return vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops,
+        err = vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops,
                                                     VGA_SWITCHEROO_DIS,
                                                     chip->bus != NULL);
+        if (err < 0)
+                return err;
+        chip->vga_switcheroo_registered = 1;
+        return 0;
 }
 #else
 #define init_vga_switcheroo(chip)               /* NOP */
@@ -2712,7 +2724,8 @@ static int azx_free(struct azx *chip)
         if (use_vga_switcheroo(chip)) {
                 if (chip->disabled && chip->bus)
                         snd_hda_unlock_devices(chip->bus);
-                vga_switcheroo_unregister_client(chip->pci);
+                if (chip->vga_switcheroo_registered)
+                        vga_switcheroo_unregister_client(chip->pci);
         }
 
         if (chip->initialized) {
@@ -2813,8 +2826,6 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
         SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
-        SND_PCI_QUIRK(0x1043, 0x1ac3, "ASUS X53S", POS_FIX_POSBUF),
-        SND_PCI_QUIRK(0x1043, 0x1b43, "ASUS K53E", POS_FIX_POSBUF),
         SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x10de, 0xcb89, "Macbook Pro 7,1", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),
@@ -3062,14 +3073,6 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         }
 
  ok:
-        err = register_vga_switcheroo(chip);
-        if (err < 0) {
-                snd_printk(KERN_ERR SFX
-                           "Error registering VGA-switcheroo client\n");
-                azx_free(chip);
-                return err;
-        }
-
         err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
         if (err < 0) {
                 snd_printk(KERN_ERR SFX "Error creating device [card]!\n");
@@ -3340,6 +3343,13 @@ static int __devinit azx_probe(struct pci_dev *pci,
         if (pci_dev_run_wake(pci))
                 pm_runtime_put_noidle(&pci->dev);
 
+        err = register_vga_switcheroo(chip);
+        if (err < 0) {
+                snd_printk(KERN_ERR SFX
+                           "Error registering VGA-switcheroo client\n");
+                goto out_free;
+        }
+
         dev++;
         return 0;
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 8253b4eeb6a1..48d9d609f89b 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2598,8 +2598,10 @@ static const char *alc_get_line_out_pfx(struct alc_spec *spec, int ch,
                         return "PCM";
                 break;
         }
-        if (snd_BUG_ON(ch >= ARRAY_SIZE(channel_name)))
+        if (ch >= ARRAY_SIZE(channel_name)) {
+                snd_BUG();
                 return "PCM";
+        }
 
         return channel_name[ch];
 }