diff options
| author | Mark Brown <[email protected]> | 2018-01-05 12:43:22 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2018-01-05 12:43:22 +0000 |
| commit | 642839b6decf26f63d6cd4b9e11534b44c822c87 (patch) | |
| tree | 45a174d2e1cbdae991f7bd0e1aaf4b8f6877811a | |
| parent | 30a7acd573899fd8b8ac39236eff6468b195ac7d (diff) | |
| parent | 20a1ea2222e7cbf96e9bf8579362e971491e6aea (diff) | |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
| -rw-r--r-- | sound/soc/intel/skylake/skl-nhlt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c index 3eaac41090ca..26b0a5caea5a 100644 --- a/sound/soc/intel/skylake/skl-nhlt.c +++ b/sound/soc/intel/skylake/skl-nhlt.c @@ -43,7 +43,8 @@ struct nhlt_acpi_table *skl_nhlt_init(struct device *dev) 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); |