Commit 6bd6cd29 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

serial: stm32: Ignore return value of uart_remove_one_port() in .remove() 



Returning early from stm32_usart_serial_remove() results in a resource
leak as several cleanup functions are not called. The driver core ignores
the return value and there is no possibility to clean up later.

uart_remove_one_port() only returns non-zero if there is some
inconsistency (i.e. stm32_usart_driver.state[port->line].uart_port == NULL).
This should never happen, and even if it does it's a bad idea to exit
early in the remove callback without cleaning up.

This prepares changing the prototype of struct platform_driver::remove to
return void. See commit 5c5a7680 ("platform: Provide a remove callback
that returns no value") for further details about this quest.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230512173810.131447-2-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 72fc578b

drivers/tty/serial/stm32-usart.c

+1 −4
Original line number Diff line number Diff line
@@ -1755,13 +1755,10 @@ static int stm32_usart_serial_remove(struct platform_device *pdev) 
	struct uart_port *port = platform_get_drvdata(pdev);

	struct stm32_port *stm32_port = to_stm32_port(port);

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	int err;

	u32 cr3;



	pm_runtime_get_sync(&pdev->dev);

	err = uart_remove_one_port(&stm32_usart_driver, port);

	if (err)

		return(err);

	uart_remove_one_port(&stm32_usart_driver, port);



	pm_runtime_disable(&pdev->dev);

	pm_runtime_set_suspended(&pdev->dev);