diff options
| author | Guneshwor Singh <guneshwor.o.singh@intel.com> | 2017-12-06 16:34:04 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-12-06 17:46:04 +0000 |
| commit | e02b03303f13b6a571f01b4d84b69440696d2dde (patch) | |
| tree | 66bffbc1ced51706beacffd5eabbd814c652af20 /sound | |
| parent | 4c761ebfcb2d04ee36783c4c8c45ae00caf59d36 (diff) | |
| download | linux-stable-e02b03303f13b6a571f01b4d84b69440696d2dde.tar.gz linux-stable-e02b03303f13b6a571f01b4d84b69440696d2dde.tar.bz2 linux-stable-e02b03303f13b6a571f01b4d84b69440696d2dde.zip | |
ASoC: Intel: Skylake: Do not check dev_type for dmic link type
Some BIOS have inconsistent dev_type value for DMIC link type.
Since there is only one device type for DMIC link type, remove device
type check if link type is NHLT_LINK_DMIC.
Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/skylake/skl-nhlt.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c index d14c50a60289..3eaac41090ca 100644 --- a/sound/soc/intel/skylake/skl-nhlt.c +++ b/sound/soc/intel/skylake/skl-nhlt.c @@ -119,11 +119,16 @@ static bool skl_check_ep_match(struct device *dev, struct nhlt_endpoint *epnt, if ((epnt->virtual_bus_id == instance_id) && (epnt->linktype == link_type) && - (epnt->direction == dirn) && - (epnt->device_type == dev_type)) - return true; - else - return false; + (epnt->direction == dirn)) { + /* do not check dev_type for DMIC link type */ + if (epnt->linktype == NHLT_LINK_DMIC) + return true; + + if (epnt->device_type == dev_type) + return true; + } + + return false; } struct nhlt_specific_cfg |