Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ec49e816 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents a8750ddc 845ab400

include/sound/soc-acpi-intel-match.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H

#define __LINUX_SND_SOC_ACPI_INTEL_MATCH_H



#include <linux/module.h>

#include <linux/stddef.h>

#include <linux/acpi.h>

include/sound/soc-acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <linux/stddef.h>

#include <linux/acpi.h>

#include <linux/mod_devicetable.h>



struct snd_soc_acpi_package_context {

	char *name;           /* package name */

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);

sound/soc/soc-acpi.c

+3 −5
Original line number Diff line number Diff line
@@ -84,10 +84,8 @@ snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) 


	for (mach = machines; mach->id[0]; mach++) {

		if (snd_soc_acpi_check_hid(mach->id) == true) {

			if (mach->machine_quirk == NULL)

				return mach;



			if (mach->machine_quirk(mach) != NULL)

			if (mach->machine_quirk)

				mach = mach->machine_quirk(mach);

			return mach;

		}

	}