diff options
author | Dave Airlie <airlied@redhat.com> | 2021-07-26 09:27:59 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2021-07-26 09:27:59 +1000 |
commit | 35482f9dc56b9bd0f179106da7e461f6c2a2d891 (patch) | |
tree | b04c95e464c3724b5b5b0ba50ad4a26886b2497a /drivers/firmware/efi/dev-path-parser.c | |
parent | 8da49a33dda7294c1af508f8aa81cd638d0afd62 (diff) | |
parent | ff1176468d368232b684f75e82563369208bc371 (diff) |
Backmerge tag 'v5.14-rc3' into drm-next
Linux 5.14-rc3
Daniel said we should pull the nouveau fix from fixes in here, probably
a good plan.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/firmware/efi/dev-path-parser.c')
-rw-r--r-- | drivers/firmware/efi/dev-path-parser.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/firmware/efi/dev-path-parser.c b/drivers/firmware/efi/dev-path-parser.c index 10d4457417a4..eb9c65f97841 100644 --- a/drivers/firmware/efi/dev-path-parser.c +++ b/drivers/firmware/efi/dev-path-parser.c @@ -34,7 +34,6 @@ static long __init parse_acpi_path(const struct efi_dev_path *node, break; if (!adev->pnp.unique_id && node->acpi.uid == 0) break; - acpi_dev_put(adev); } if (!adev) return -ENODEV; |