Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next

1 files changed, 10 insertions, 0 deletions

diff --git a/sound/hda/local.h b/sound/hda/local.h
index d692f417ddc0..0d5bb159d538 100644
--- a/sound/hda/local.h
+++ b/sound/hda/local.h
@@ -16,6 +16,16 @@ static inline int get_wcaps_type(unsigned int wcaps)
         return (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
 }
 
+static inline unsigned int get_wcaps_channels(u32 wcaps)
+{
+        unsigned int chans;
+
+        chans = (wcaps & AC_WCAP_CHAN_CNT_EXT) >> 13;
+        chans = (chans + 1) * 2;
+
+        return chans;
+}
+
 extern const struct attribute_group *hdac_dev_attr_groups[];
 int hda_widget_sysfs_init(struct hdac_device *codec);
 void hda_widget_sysfs_exit(struct hdac_device *codec);