mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-04-23 14:54:03 +00:00
sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()
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> Reviewed-by: Vladimir Zapolskiy <vz@mleia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6734330654
commit
ac0cdb3d99
1 changed files with 10 additions and 2 deletions
|
@ -1507,7 +1507,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
|
||||||
|
|
||||||
|
@ -1515,10 +1515,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);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue