* [PATCH] video: fbdev: via: Fix error in via_core_init()
@ 2022-11-14 1:08 Shang XiaoJing
2022-11-14 7:26 ` Helge Deller
0 siblings, 1 reply; 2+ messages in thread
From: Shang XiaoJing @ 2022-11-14 1:08 UTC (permalink / raw)
To: FlorianSchandinat, deller, corbet, linux-fbdev, dri-devel; +Cc: shangxiaojing
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>
---
drivers/video/fbdev/via/via-core.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/via/via-core.c b/drivers/video/fbdev/via/via-core.c
index 2ee8fcae08df..b2e3b5df38cd 100644
--- a/drivers/video/fbdev/via/via-core.c
+++ b/drivers/video/fbdev/via/via-core.c
@@ -730,7 +730,15 @@ 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();
+ viafb_exit();
+ return ret;
+ }
+
+ return 0;
}
static void __exit via_core_exit(void)
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] video: fbdev: via: Fix error in via_core_init()
2022-11-14 1:08 [PATCH] video: fbdev: via: Fix error in via_core_init() Shang XiaoJing
@ 2022-11-14 7:26 ` Helge Deller
0 siblings, 0 replies; 2+ messages in thread
From: Helge Deller @ 2022-11-14 7:26 UTC (permalink / raw)
To: Shang XiaoJing, FlorianSchandinat, corbet, linux-fbdev, dri-devel
On 11/14/22 02:08, Shang XiaoJing wrote:
> 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>
applied.
Thanks!
Helge
> ---
> drivers/video/fbdev/via/via-core.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/via/via-core.c b/drivers/video/fbdev/via/via-core.c
> index 2ee8fcae08df..b2e3b5df38cd 100644
> --- a/drivers/video/fbdev/via/via-core.c
> +++ b/drivers/video/fbdev/via/via-core.c
> @@ -730,7 +730,15 @@ 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();
> + viafb_exit();
> + return ret;
> + }
> +
> + return 0;
> }
>
> static void __exit via_core_exit(void)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-14 7:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-14 1:08 [PATCH] video: fbdev: via: Fix error in via_core_init() Shang XiaoJing
2022-11-14 7:26 ` Helge Deller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox