diff mbox series

video: fbdev: via: Fix error in via_core_init()

Message ID 20221114010852.24654-1-shangxiaojing@huawei.com
State New
Headers show
Series video: fbdev: via: Fix error in via_core_init() | expand

Commit Message

shangxiaojing Nov. 14, 2022, 1:08 a.m. UTC
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(-)

Comments

Helge Deller Nov. 14, 2022, 7:26 a.m. UTC | #1
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)
diff mbox series

Patch

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)