Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9413f188 authored by Shang XiaoJing's avatar Shang XiaoJing Committed by Greg Kroah-Hartman
Browse files

fbdev: via: Fix error in via_core_init() 



[ Upstream commit 5886b130de953cfb8826f7771ec8640a79934a7f ]

via_core_init() won't exit the driver when pci_register_driver() failed.
Exit the viafb-i2c and the viafb-gpio in failed path to prevent error.

VIA Graphics Integration Chipset framebuffer 2.4 initializing
Error: Driver 'viafb-i2c' is already registered, aborting...
Error: Driver 'viafb-gpio' is already registered, aborting...

Fixes: 7582eb9b ("viafb: Turn GPIO and i2c into proper platform devices")
Signed-off-by: default avatarShang XiaoJing <shangxiaojing@huawei.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 65dbd8ee

drivers/video/fbdev/via/via-core.c

+8 −1
Original line number Diff line number Diff line
@@ -732,7 +732,14 @@ static int __init via_core_init(void) 
		return ret;

	viafb_i2c_init();

	viafb_gpio_init();

	return pci_register_driver(&via_driver);

	ret = pci_register_driver(&via_driver);

	if (ret) {

		viafb_gpio_exit();

		viafb_i2c_exit();

		return ret;

	}



	return 0;

}



static void __exit via_core_exit(void)