diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-09 17:04:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-09 17:04:44 -0800 |
| commit | b9b56eb280451ccfd42e9e554e83c6202a2d286b (patch) | |
| tree | 09d9c27844b169c81a9a60b60ab7a30d2c0a4291 | |
| parent | 3efcce4a9ec0d2f47ad7c501d0b072c12a1706af (diff) | |
| parent | 09aeaabebdafbcf4afd1c481beaff37ecbc6b023 (diff) | |
| download | kvm-b9b56eb280451ccfd42e9e554e83c6202a2d286b.tar.gz | |
Merge tag 'tag-chrome-platform-firmware-for-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux
Pull chrome platform firmware updates from Tzung-Bi Shih:
- Fix an invalid address access.
- Use .remove_new() for converting the callback to return void
* tag 'tag-chrome-platform-firmware-for-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
firmware: coreboot: Convert to platform remove callback returning void
firmware: coreboot: framebuffer: Avoid invalid zero physical address
| -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 && |