Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown 2018-01-12 12:28:40 +00:00
commit 5b139ebe46
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc-acpi-intel-match.h
View File

@ -16,6 +16,7 @@
#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H #ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
#define __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/stddef.h>
#include <linux/acpi.h> #include <linux/acpi.h>

1
include/sound/soc-acpi.h
View File

@ -17,6 +17,7 @@
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/mod_devicetable.h>
struct snd_soc_acpi_package_context { struct snd_soc_acpi_package_context {
char *name; /* package name */ char *name; /* package name */

3
sound/soc/intel/skylake/skl-nhlt.c
View File

@ -43,7 +43,8 @@ struct nhlt_acpi_table *skl_nhlt_init(struct device *dev)
obj = acpi_evaluate_dsm(handle, &osc_guid, 1, 1, NULL); obj = acpi_evaluate_dsm(handle, &osc_guid, 1, 1, NULL);
if (obj && obj->type == ACPI_TYPE_BUFFER) { if (obj && obj->type == ACPI_TYPE_BUFFER) {
nhlt_ptr = (struct nhlt_resource_desc *)obj->buffer.pointer; 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(nhlt_ptr->min_addr, nhlt_ptr->length,
MEMREMAP_WB); MEMREMAP_WB);
ACPI_FREE(obj); ACPI_FREE(obj);

8
sound/soc/soc-acpi.c
View File

@ -84,11 +84,9 @@ snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines)
for (mach = machines; mach->id[0]; mach++) { for (mach = machines; mach->id[0]; mach++) {
if (snd_soc_acpi_check_hid(mach->id) == true) { if (snd_soc_acpi_check_hid(mach->id) == true) {
if (mach->machine_quirk == NULL) if (mach->machine_quirk)
return mach; mach = mach->machine_quirk(mach);
return mach;
if (mach->machine_quirk(mach) != NULL)
return mach;
} }
} }
return NULL; return NULL;