shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'pnp-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Browse Source 
Pull PnP update from Rafael Wysocki:
 "Replace acpi_bus_get_device() in the PNP code with
  acpi_fetch_acpi_dev() which is better"

* tag 'pnp-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: Replace acpi_bus_get_device()
This commit is contained in:
Linus Torvalds
2022-03-21 14:46:01 -07:00
parent f648372dfe ed945296bb
commit f400bea2d4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pnp/pnpacpi/core.c
View File

@@ -287,9 +287,9 @@ static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,
u32 lvl, void *context, u32 lvl, void *context,
void **rv) void **rv)
{ {
struct acpi_device *device; struct acpi_device *device = acpi_fetch_acpi_dev(handle);
if (acpi_bus_get_device(handle, &device)) if (!device)
return AE_CTRL_DEPTH; return AE_CTRL_DEPTH;
if (acpi_is_pnp_device(device)) if (acpi_is_pnp_device(device))
pnpacpi_add_device(device); pnpacpi_add_device(device);