firmware: google: Release devices before unregistering the bus

[ Upstream commit 99b41724df4607535ceacd3b79a55310a2b2825e ]

Fix a bug where the kernel module can't be loaded after it has been
unloaded as the devices are still present and conflicting with the
to be created coreboot devices.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Link: https://lore.kernel.org/r/20191118101934.22526-2-patrick.rudolph@9elements.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 65946690ed8d ("firmware: coreboot: Register bus in module init")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/firmware/google/coreboot_table.c b/drivers/firmware/google/coreboot_table.c
index 8d132e4f008aff21ba46e2681e88c7f39d165124..0205987a4fd4f08614e386b294e0bb9330b33ffc 100644 (file)
--- a/drivers/firmware/google/coreboot_table.c
+++ b/drivers/firmware/google/coreboot_table.c
@@ -163,8 +163,15 @@ static int coreboot_table_probe(struct platform_device *pdev)
        return ret;
 }
 
+static int __cb_dev_unregister(struct device *dev, void *dummy)
+{
+       device_unregister(dev);
+       return 0;
+}
+
 static int coreboot_table_remove(struct platform_device *pdev)
 {
+       bus_for_each_dev(&coreboot_bus_type, NULL, NULL, __cb_dev_unregister);
        bus_unregister(&coreboot_bus_type);
        return 0;
 }