* [PATCH serial] sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()
@ 2019-03-08 14:09 Mao Wenan
2019-03-08 13:58 ` maowenan
2019-03-08 20:26 ` Vladimir Zapolskiy
0 siblings, 2 replies; 4+ messages in thread
From: Mao Wenan @ 2019-03-08 14:09 UTC (permalink / raw)
To: gregkh, jslaby, linux-serial, kernel-janitors, linux-kernel
Add the missing uart_unregister_driver() and i2c_del_driver() before return
from sc16is7xx_init() in the error handling case.
Signed-off-by: Mao Wenan <maowenan@huawei.com>
---
drivers/tty/serial/sc16is7xx.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 268098681856..114e94f476c6 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -1509,7 +1509,7 @@ static int __init sc16is7xx_init(void)
ret = i2c_add_driver(&sc16is7xx_i2c_uart_driver);
if (ret < 0) {
pr_err("failed to init sc16is7xx i2c --> %d\n", ret);
- return ret;
+ goto err_i2c;
}
#endif
@@ -1517,10 +1517,18 @@ static int __init sc16is7xx_init(void)
ret = spi_register_driver(&sc16is7xx_spi_uart_driver);
if (ret < 0) {
pr_err("failed to init sc16is7xx spi --> %d\n", ret);
- return ret;
+ goto err_spi;
}
#endif
return ret;
+
+err_spi:
+#ifdef CONFIG_SERIAL_SC16IS7XX_I2C
+ i2c_del_driver(&sc16is7xx_i2c_uart_driver);
+#endif
+err_i2c:
+ uart_unregister_driver(&sc16is7xx_uart);
+ return ret;
}
module_init(sc16is7xx_init);
--
2.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH serial] sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()
2019-03-08 14:09 [PATCH serial] sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init() Mao Wenan
@ 2019-03-08 13:58 ` maowenan
2019-03-08 20:26 ` Vladimir Zapolskiy
1 sibling, 0 replies; 4+ messages in thread
From: maowenan @ 2019-03-08 13:58 UTC (permalink / raw)
To: gregkh, jslaby, linux-serial, kernel-janitors, linux-kernel
sorry for duplicate mail, please ignore this one.
On 2019/3/8 22:09, Mao Wenan wrote:
> Add the missing uart_unregister_driver() and i2c_del_driver() before return
> from sc16is7xx_init() in the error handling case.
>
> Signed-off-by: Mao Wenan <maowenan@huawei.com>
> ---
> drivers/tty/serial/sc16is7xx.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
> index 268098681856..114e94f476c6 100644
> --- a/drivers/tty/serial/sc16is7xx.c
> +++ b/drivers/tty/serial/sc16is7xx.c
> @@ -1509,7 +1509,7 @@ static int __init sc16is7xx_init(void)
> ret = i2c_add_driver(&sc16is7xx_i2c_uart_driver);
> if (ret < 0) {
> pr_err("failed to init sc16is7xx i2c --> %d\n", ret);
> - return ret;
> + goto err_i2c;
> }
> #endif
>
> @@ -1517,10 +1517,18 @@ static int __init sc16is7xx_init(void)
> ret = spi_register_driver(&sc16is7xx_spi_uart_driver);
> if (ret < 0) {
> pr_err("failed to init sc16is7xx spi --> %d\n", ret);
> - return ret;
> + goto err_spi;
> }
> #endif
> return ret;
> +
> +err_spi:
> +#ifdef CONFIG_SERIAL_SC16IS7XX_I2C
> + i2c_del_driver(&sc16is7xx_i2c_uart_driver);
> +#endif
> +err_i2c:
> + uart_unregister_driver(&sc16is7xx_uart);
> + return ret;
> }
> module_init(sc16is7xx_init);
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH serial] sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()
2019-03-08 14:09 [PATCH serial] sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init() Mao Wenan
2019-03-08 13:58 ` maowenan
@ 2019-03-08 20:26 ` Vladimir Zapolskiy
1 sibling, 0 replies; 4+ messages in thread
From: Vladimir Zapolskiy @ 2019-03-08 20:26 UTC (permalink / raw)
To: Mao Wenan, gregkh, jslaby, linux-serial, kernel-janitors, linux-kernel
On 03/08/2019 04:09 PM, Mao Wenan wrote:
> Add the missing uart_unregister_driver() and i2c_del_driver() before return
> from sc16is7xx_init() in the error handling case.
>
> Signed-off-by: Mao Wenan <maowenan@huawei.com>
> ---
> drivers/tty/serial/sc16is7xx.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
> index 268098681856..114e94f476c6 100644
> --- a/drivers/tty/serial/sc16is7xx.c
> +++ b/drivers/tty/serial/sc16is7xx.c
> @@ -1509,7 +1509,7 @@ static int __init sc16is7xx_init(void)
> ret = i2c_add_driver(&sc16is7xx_i2c_uart_driver);
> if (ret < 0) {
> pr_err("failed to init sc16is7xx i2c --> %d\n", ret);
> - return ret;
> + goto err_i2c;
> }
> #endif
>
> @@ -1517,10 +1517,18 @@ static int __init sc16is7xx_init(void)
> ret = spi_register_driver(&sc16is7xx_spi_uart_driver);
> if (ret < 0) {
> pr_err("failed to init sc16is7xx spi --> %d\n", ret);
> - return ret;
> + goto err_spi;
> }
> #endif
> return ret;
> +
> +err_spi:
> +#ifdef CONFIG_SERIAL_SC16IS7XX_I2C
> + i2c_del_driver(&sc16is7xx_i2c_uart_driver);
> +#endif
> +err_i2c:
> + uart_unregister_driver(&sc16is7xx_uart);
> + return ret;
> }
> module_init(sc16is7xx_init);
>
>
Nice catch, thank you!
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
--
Best wishes,
Vladimir
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH serial] sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()
@ 2019-03-08 14:08 Mao Wenan
0 siblings, 0 replies; 4+ messages in thread
From: Mao Wenan @ 2019-03-08 14:08 UTC (permalink / raw)
To: gregkh, jslaby, linux-serial, kernel-janitors, linux-kernel
Add the missing uart_unregister_driver() and i2c_del_driver() before return
from sc16is7xx_init() in the error handling case.
Signed-off-by: Mao Wenan <maowenan@huawei.com>
---
drivers/tty/serial/sc16is7xx.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 268098681856..114e94f476c6 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -1509,7 +1509,7 @@ static int __init sc16is7xx_init(void)
ret = i2c_add_driver(&sc16is7xx_i2c_uart_driver);
if (ret < 0) {
pr_err("failed to init sc16is7xx i2c --> %d\n", ret);
- return ret;
+ goto err_i2c;
}
#endif
@@ -1517,10 +1517,18 @@ static int __init sc16is7xx_init(void)
ret = spi_register_driver(&sc16is7xx_spi_uart_driver);
if (ret < 0) {
pr_err("failed to init sc16is7xx spi --> %d\n", ret);
- return ret;
+ goto err_spi;
}
#endif
return ret;
+
+err_spi:
+#ifdef CONFIG_SERIAL_SC16IS7XX_I2C
+ i2c_del_driver(&sc16is7xx_i2c_uart_driver);
+#endif
+err_i2c:
+ uart_unregister_driver(&sc16is7xx_uart);
+ return ret;
}
module_init(sc16is7xx_init);
--
2.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-08 20:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-08 14:09 [PATCH serial] sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init() Mao Wenan
2019-03-08 13:58 ` maowenan
2019-03-08 20:26 ` Vladimir Zapolskiy
-- strict thread matches above, loose matches on Subject: below --
2019-03-08 14:08 Mao Wenan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®