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

Commit acede70d authored by Yuriy Kozlov's avatar Yuriy Kozlov Committed by Greg Kroah-Hartman
Browse files

tty: serial: altera_uart: Check for NULL platform_data in probe. 



Follow altera_jtag_uart.  This fixes a crash if there is a mistake in the DTS.

Signed-off-by: default avatarYuriy Kozlov <ykozlov@ptcusa.com>
Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef37ea34

drivers/tty/serial/altera_uart.c

+2 −2
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ static int __devinit altera_uart_probe(struct platform_device *pdev) 
	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res_mem)

		port->mapbase = res_mem->start;

	else if (platp->mapbase)

	else if (platp)

		port->mapbase = platp->mapbase;

	else

		return -EINVAL;
@@ -564,7 +564,7 @@ static int __devinit altera_uart_probe(struct platform_device *pdev) 
	res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (res_irq)

		port->irq = res_irq->start;

	else if (platp->irq)

	else if (platp)

		port->irq = platp->irq;



	/* Check platform data first so we can override device node data */