diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-01-08 13:13:55 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-01-08 13:13:55 +1100 |
| commit | c8e1bdfa8bff41cf5f7bab67e0b0ca2227419d1c (patch) | |
| tree | 2e59056129106b8980a1fb2b749d05e95be6f7f7 | |
| parent | 6dafafa00a8ecb1d67aa2021e6f92d6b77e17e70 (diff) | |
| parent | 09aeaabebdafbcf4afd1c481beaff37ecbc6b023 (diff) | |
| download | linux-next-c8e1bdfa8bff41cf5f7bab67e0b0ca2227419d1c.tar.gz | |
Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
| -rw-r--r-- | drivers/firmware/google/coreboot_table.c | 5 | ||||
| -rw-r--r-- | drivers/firmware/google/framebuffer-coreboot.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/firmware/google/coreboot_table.c b/drivers/firmware/google/coreboot_table.c index 33ae94745aef97..2a4469bf1b81ce 100644 --- a/drivers/firmware/google/coreboot_table.c +++ b/drivers/firmware/google/coreboot_table.c @@ -176,10 +176,9 @@ static int __cb_dev_unregister(struct device *dev, void *dummy) return 0; } -static int coreboot_table_remove(struct platform_device *pdev) +static void coreboot_table_remove(struct platform_device *pdev) { bus_for_each_dev(&coreboot_bus_type, NULL, NULL, __cb_dev_unregister); - return 0; } #ifdef CONFIG_ACPI @@ -201,7 +200,7 @@ MODULE_DEVICE_TABLE(of, coreboot_of_match); static struct platform_driver coreboot_table_driver = { .probe = coreboot_table_probe, - .remove = coreboot_table_remove, + .remove_new = coreboot_table_remove, .driver = { .name = "coreboot_table", .acpi_match_table = ACPI_PTR(cros_coreboot_acpi_match), diff --git a/drivers/firmware/google/framebuffer-coreboot.c b/drivers/firmware/google/framebuffer-coreboot.c index c323a818805cc9..5c84bbebfef856 100644 --- a/drivers/firmware/google/framebuffer-coreboot.c +++ b/drivers/firmware/google/framebuffer-coreboot.c @@ -36,6 +36,9 @@ static int framebuffer_probe(struct coreboot_device *dev) .format = NULL, }; + if (!fb->physical_address) + return -ENODEV; + for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (fb->bits_per_pixel == formats[i].bits_per_pixel && fb->red_mask_pos == formats[i].red.offset && |