diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-01-11 19:49:27 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-01-11 19:49:27 +0100 |
commit | 6cf4569ce3561dec560147e6051959d6896b23d1 (patch) | |
tree | 2b3dca47673824975c35a708a6d9d24ff46a2771 /drivers/acpi/scan.c | |
parent | 2e40795c3bf344cfb5220d94566205796e3ef19a (diff) | |
parent | 42e0ebdef53d91891939a475c6ef23970829ff99 (diff) | |
download | linux-6cf4569ce3561dec560147e6051959d6896b23d1.tar.bz2 |
Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.10
As well as the usual smattering of driver specific fixes collected since
the merge window this has one particularly important fix to the core for
handling of aux_devs which was broken during the merge window by some of
the componentization refactoring.
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 45dec874ea55..192691880d55 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2074,6 +2074,7 @@ int __init acpi_scan_init(void) } } + acpi_gpe_apply_masked_gpes(); acpi_update_all_gpes(); acpi_ec_ecdt_start(); |