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

Commit dfa7f343 authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Linus Torvalds
Browse files

atmel_serial: fix bugs in probe() error path and remove() 



When an error happens in probe(), the clocks should be disabled, but
only if the port isn't already used as a console.

In remove(), the port struct shouldn't be freed because it's defined
statically.

Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Andrew Victor <linux@maxim.org.za>
Tested-by: default avatarMarc Pignat <marc.pignat@hevs.ch>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1c0fd82f

drivers/serial/atmel_serial.c

+29 −10
Original line number Diff line number Diff line
@@ -934,8 +934,18 @@ static int __init atmel_late_console_init(void) 


core_initcall(atmel_late_console_init);



static inline bool atmel_is_console_port(struct uart_port *port)

{

	return port->cons && port->cons->index == port->line;

}



#else

#define ATMEL_CONSOLE_DEVICE	NULL



static inline bool atmel_is_console_port(struct uart_port *port)

{

	return false;

}

#endif



static struct uart_driver atmel_uart = {
@@ -993,9 +1003,19 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) 
	atmel_init_port(port, pdev);



	ret = uart_add_one_port(&atmel_uart, &port->uart);

	if (!ret) {

	if (ret)

		goto err_add_port;



	device_init_wakeup(&pdev->dev, 1);

	platform_set_drvdata(pdev, port);



	return 0;



err_add_port:

	if (!atmel_is_console_port(&port->uart)) {

		clk_disable(port->clk);

		clk_put(port->clk);

		port->clk = NULL;

	}



	return ret;
@@ -1007,16 +1027,15 @@ static int __devexit atmel_serial_remove(struct platform_device *pdev) 
	struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;

	int ret = 0;



	clk_disable(atmel_port->clk);

	clk_put(atmel_port->clk);



	device_init_wakeup(&pdev->dev, 0);

	platform_set_drvdata(pdev, NULL);



	if (port) {

	ret = uart_remove_one_port(&atmel_uart, port);

		kfree(port);

	}



	/* "port" is allocated statically, so we shouldn't free it */



	clk_disable(atmel_port->clk);

	clk_put(atmel_port->clk);



	return ret;

}