Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

diff --combined sound/soc/intel/skylake/skl-nhlt.c
index 3eaac41090ca7f8b07ed99511d58cbc1f5498c56,1ce414d86d8a422969719aa755692a8c20ca11b4..26b0a5caea5ab75707bf8461082e18524e80d816
--- 1/sound/soc/intel/skylake/skl-nhlt.c
--- 2/sound/soc/intel/skylake/skl-nhlt.c
+++ b/sound/soc/intel/skylake/skl-nhlt.c
@@@ -43,7 -43,8 +43,8 @@@ struct nhlt_acpi_table *skl_nhlt_init(s
        obj = acpi_evaluate_dsm(handle, &osc_guid, 1, 1, NULL);
        if (obj && obj->type == ACPI_TYPE_BUFFER) {
                nhlt_ptr = (struct nhlt_resource_desc  *)obj->buffer.pointer;
-               nhlt_table = (struct nhlt_acpi_table *)
+               if (nhlt_ptr->length)
+                       nhlt_table = (struct nhlt_acpi_table *)
                                memremap(nhlt_ptr->min_addr, nhlt_ptr->length,
                                MEMREMAP_WB);
                ACPI_FREE(obj);
@@@ -119,16 -120,11 +120,16 @@@ static bool skl_check_ep_match(struct d
  
        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