Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 7582eb9be85f ("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>

authored by

Shang XiaoJing and committed by
Helge Deller
5886b130 ed359a46

+8 -1
+8 -1
drivers/video/fbdev/via/via-core.c
··· 733 733 return ret; 734 734 viafb_i2c_init(); 735 735 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; 737 744 } 738 745 739 746 static void __exit via_core_exit(void)