Skip to content

Commit 5886b13

Browse files
Shang XiaoJinghdeller
authored andcommitted
fbdev: via: Fix error in via_core_init()
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: 7582eb9 ("viafb: Turn GPIO and i2c into proper platform devices") Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent ed359a4 commit 5886b13

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,14 @@ static int __init via_core_init(void)
733733
return ret;
734734
viafb_i2c_init();
735735
viafb_gpio_init();
736-
return pci_register_driver(&via_driver);
736+
ret = pci_register_driver(&via_driver);
737+
if (ret) {
738+
viafb_gpio_exit();
739+
viafb_i2c_exit();
740+
return ret;
741+
}
742+
743+
return 0;
737744
}
738745

739746
static void __exit via_core_exit(void)

0 commit comments

Comments
 (0)