diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-01-04 15:37:09 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-01-04 15:37:09 +0100 |
| commit | 8e0feb25172b51978b9240aea1f0628c5b45b5b1 (patch) | |
| tree | 5db593acdbf2a10ae5ac861b2f002b71de3b8ce7 /drivers/acpi/dock.c | |
| parent | 9f6875660c412cd8338ea7a66081cf35f812697a (diff) | |
| parent | 0890186a965868fa464582d5610c74eeff252c93 (diff) | |
| download | linux-8e0feb25172b51978b9240aea1f0628c5b45b5b1.tar.bz2 | |
Merge branch 'acpi-scan' into acpi-x86
Merge recent device enumeration changes to satisfy dependencies.
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index c8e9b962e18c..a89bdbe00184 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -489,9 +489,8 @@ static ssize_t docked_show(struct device *dev, struct device_attribute *attr, char *buf) { struct dock_station *dock_station = dev->platform_data; - struct acpi_device *adev = NULL; + struct acpi_device *adev = acpi_fetch_acpi_dev(dock_station->handle); - acpi_bus_get_device(dock_station->handle, &adev); return sysfs_emit(buf, "%u\n", acpi_device_enumerated(adev)); } static DEVICE_ATTR_RO(docked); |