Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e88ec72e authored by Mao Wenan's avatar Mao Wenan Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit ac0cdb3d990108df795b676cd0d0e65ac34b2273 ]

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>
parent 1ca3379d

drivers/tty/serial/sc16is7xx.c

+10 −2
Original line number Diff line number Diff line
@@ -1482,7 +1482,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
@@ -1490,10 +1490,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);