Unverified Commit 642839b6 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 30a7acd5 20a1ea22

sound/soc/intel/skylake/skl-nhlt.c

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 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;

		if (nhlt_ptr->length)

			nhlt_table = (struct nhlt_acpi_table *)

				memremap(nhlt_ptr->min_addr, nhlt_ptr->length,

				MEMREMAP_WB);