Commit e1dcf2bd authored by Mao Wenan's avatar Mao Wenan Committed by Khalid Elmously

sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()

BugLink: https://bugs.launchpad.net/bugs/1830176

[ Upstream commit ac0cdb3d ]

Add the missing uart_unregister_driver() and i2c_del_driver() before return
from sc16is7xx_init() in the error handling case.
Signed-off-by: default avatarMao Wenan <maowenan@huawei.com>
Reviewed-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin (Microsoft) <sashal@kernel.org>
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 7fe9184d
...@@ -1448,7 +1448,7 @@ static int __init sc16is7xx_init(void) ...@@ -1448,7 +1448,7 @@ static int __init sc16is7xx_init(void)
ret = i2c_add_driver(&sc16is7xx_i2c_uart_driver); ret = i2c_add_driver(&sc16is7xx_i2c_uart_driver);
if (ret < 0) { if (ret < 0) {
pr_err("failed to init sc16is7xx i2c --> %d\n", ret); pr_err("failed to init sc16is7xx i2c --> %d\n", ret);
return ret; goto err_i2c;
} }
#endif #endif
...@@ -1456,10 +1456,18 @@ static int __init sc16is7xx_init(void) ...@@ -1456,10 +1456,18 @@ static int __init sc16is7xx_init(void)
ret = spi_register_driver(&sc16is7xx_spi_uart_driver); ret = spi_register_driver(&sc16is7xx_spi_uart_driver);
if (ret < 0) { if (ret < 0) {
pr_err("failed to init sc16is7xx spi --> %d\n", ret); pr_err("failed to init sc16is7xx spi --> %d\n", ret);
return ret; goto err_spi;
} }
#endif #endif
return ret; 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); module_init(sc16is7xx_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment