Commit f400bea2 authored by Linus Torvalds's avatar Linus Torvalds

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

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()
parents f648372d ed945296
...@@ -287,9 +287,9 @@ static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle, ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment