diff options
| author | Shang XiaoJing <shangxiaojing@huawei.com> | 2022-11-14 09:08:52 +0800 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2022-12-14 20:01:50 +0100 |
| commit | 5886b130de953cfb8826f7771ec8640a79934a7f (patch) | |
| tree | 4e7a626e201d8e396051d4b0a4e9c2c58c673303 /drivers/video | |
| parent | ed359a464846b48f76ea6cc5cd8257e545ac97f4 (diff) | |
| download | linux-stable-5886b130de953cfb8826f7771ec8640a79934a7f.tar.gz linux-stable-5886b130de953cfb8826f7771ec8640a79934a7f.tar.bz2 linux-stable-5886b130de953cfb8826f7771ec8640a79934a7f.zip | |
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/via/via-core.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/video/fbdev/via/via-core.c b/drivers/video/fbdev/via/via-core.c index 32a6399b080b..2c1803eb196f 100644 --- a/drivers/video/fbdev/via/via-core.c +++ b/drivers/video/fbdev/via/via-core.c @@ -733,7 +733,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) |