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

Commit e96fabd8 authored by Tobias Klauser's avatar Tobias Klauser Committed by Greg Kroah-Hartman
Browse files

tty: serial: altera_uart: Handle pdev->id == -1 in altera_uart_remove 



Commit 6b5756f1 introduced the
possibility for pdev->id being -1 but the change was not done equally in
altera_uart_remove. This patch fixes this.

Acked-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d6378375

drivers/tty/serial/altera_uart.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -561,9 +561,15 @@ static int __devinit altera_uart_probe(struct platform_device *pdev) 




static int __devexit altera_uart_remove(struct platform_device *pdev)

static int __devexit altera_uart_remove(struct platform_device *pdev)

{

{

	struct uart_port *port = &altera_uart_ports[pdev->id].port;

	struct uart_port *port;

	int i = pdev->id;





	if (i == -1)

		i = 0;



	port = &altera_uart_ports[i].port;

	uart_remove_one_port(&altera_uart_driver, port);

	uart_remove_one_port(&altera_uart_driver, port);



	return 0;

	return 0;

}

}