Commit b9b56eb2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tag-chrome-platform-firmware-for-v6.8' of... 

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
parents 3efcce4a 09aeaabe

drivers/firmware/google/coreboot_table.c

+2 −3
Original line number Diff line number Diff line
@@ -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),

drivers/firmware/google/framebuffer-coreboot.c

+3 −0
Original line number Diff line number Diff line
@@ -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 &&