Merge branch 'fix/hda' into topic/hda

1 files changed, 7 insertions, 0 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index a2f4a116f872..6abaa6bbb3d6 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1469,6 +1469,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
                 mutex_unlock(&chip->open_mutex);
                 return err;
         }
+        snd_pcm_limit_hw_rates(runtime);
         spin_lock_irqsave(&chip->reg_lock, flags);
         azx_dev->substream = substream;
         azx_dev->running = 0;
@@ -1478,6 +1479,12 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
         snd_pcm_set_sync(substream);
         mutex_unlock(&chip->open_mutex);
 
+        if (snd_BUG_ON(!runtime->hw.channels_min || !runtime->hw.channels_max))
+                return -EINVAL;
+        if (snd_BUG_ON(!runtime->hw.formats))
+                return -EINVAL;
+        if (snd_BUG_ON(!runtime->hw.rates))
+                return -EINVAL;
         return 0;
 }