2 files changed, 5 insertions, 0 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index e594de0b153e..535bcb7601b5 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -155,6 +155,8 @@ int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid,
         unsigned int parm;
 
         parm = snd_hda_param_read(codec, nid, AC_PAR_NODE_COUNT);
+        if (parm == -1)
+                return 0;
         *start_id = (parm >> 16) & 0x7fff;
         return (int)(parm & 0x7fff);
 }
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 72fd34538994..68dc9a2e3cf8 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -687,6 +687,9 @@ static int azx_reset(struct azx *chip)
 {
         int count;
 
+        /* clear STATESTS */
+        azx_writeb(chip, STATESTS, STATESTS_INT_MASK);
+
         /* reset controller */
         azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_RESET);