diff options
| author | Tom Rini <trini@konsulko.com> | 2019-03-11 11:24:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-03-11 11:24:20 -0400 |
| commit | 6a08213d52f036dbfbdd92f1416bc4b08fd4d3f6 (patch) | |
| tree | 6b2292e4cfb440166694f8715b8bb53ab38414af /arch/x86/lib/acpi_table.c | |
| parent | 19c8c9c1031ebf345a68728d6f06d943207cea0f (diff) | |
| parent | 3592965aff313a379f6f10faa05c997391c5dd82 (diff) | |
Merge git://git.denx.de/u-boot-x86
- ACPI changes and fixes to Intel Tangier/Edison
- i8254 beeper fixes
Diffstat (limited to 'arch/x86/lib/acpi_table.c')
| -rw-r--r-- | arch/x86/lib/acpi_table.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 04058a60d75..270274f6b3b 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -347,7 +347,7 @@ static void acpi_create_spcr(struct acpi_spcr *spcr) uint serial_width; int access_size; int space_id; - int ret; + int ret = -ENODEV; /* Fill out header fields */ acpi_fill_header(header, "SPCR"); @@ -355,8 +355,8 @@ static void acpi_create_spcr(struct acpi_spcr *spcr) header->revision = 2; /* Read the device once, here. It is reused below */ - ret = uclass_first_device_err(UCLASS_SERIAL, &dev); - if (!ret) + dev = gd->cur_serial_dev; + if (dev) ret = serial_getinfo(dev, &serial_info); if (ret) serial_info.type = SERIAL_CHIP_UNKNOWN; |