diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 17:02:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 17:02:01 -0800 |
| commit | 86e4ee760ef2f7571e233a3abf065ffd0bb4089d (patch) | |
| tree | 5f95cf2fea4e9002b477196da386164ec6ddfe47 /drivers/acpi/scan.c | |
| parent | b9f659b810c1f98298f9e756e49920d641a1fd95 (diff) | |
| parent | 66f5854c6894dc028fc13345838c6f82bfcfef0c (diff) | |
| download | linux-86e4ee760ef2f7571e233a3abf065ffd0bb4089d.tar.gz linux-86e4ee760ef2f7571e233a3abf065ffd0bb4089d.tar.xz | |
Merge tag 'acpi-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"Fix a recent regression in the 8250_dw serial driver introduced by
adding a quirk for the APM X-Gene SoC to it which uncovered an issue
related to the handling of built-in device properties in the core ACPI
device enumeration code (Heikki Krogerus)"
* tag 'acpi-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / platform: Add support for build-in properties
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 035ac646d8db..3d1856f1f4d0 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1734,7 +1734,7 @@ static void acpi_default_enumeration(struct acpi_device *device) &is_spi_i2c_slave); acpi_dev_free_resource_list(&resource_list); if (!is_spi_i2c_slave) { - acpi_create_platform_device(device); + acpi_create_platform_device(device, NULL); acpi_device_set_enumerated(device); } else { blocking_notifier_call_chain(&acpi_reconfig_chain, |