diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-26 13:55:17 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-26 13:55:17 +0300 |
| commit | 71e69d7adee10a55b817df748dec5bfec7bf4c30 (patch) | |
| tree | ac342851e20df5a5f7891cc603998b654d26724c /drivers/firmware/efi/dev-path-parser.c | |
| parent | 03b1292d1c0ea195e025e667555d74db7da82026 (diff) | |
| parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
| download | linux-71e69d7adee10a55b817df748dec5bfec7bf4c30.tar.xz | |
Merge 5.14-rc3 into char-misc-next
We need the char-misc fixes from 5.14-rc3 into here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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; |