diff options
| author | Yuriy Kozlov <ykozlov@ptcusa.com> | 2012-03-29 09:55:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-22 16:21:23 -0700 |
| commit | a2646264907ed038852b3ffdea9901cd5ea2305f (patch) | |
| tree | 5a2e188859fd958eaf2c85ba25b99042ec2931b4 /drivers/tty | |
| parent | b35a446b31f50aa11ca149b98bcfc517cdc9c8b6 (diff) | |
| download | kernel_samsung_smdk4412-a2646264907ed038852b3ffdea9901cd5ea2305f.zip kernel_samsung_smdk4412-a2646264907ed038852b3ffdea9901cd5ea2305f.tar.gz kernel_samsung_smdk4412-a2646264907ed038852b3ffdea9901cd5ea2305f.tar.bz2 | |
tty: serial: altera_uart: Check for NULL platform_data in probe.
commit acede70d6561f2d042d9dbb153d9a3469479c0ed upstream.
Follow altera_jtag_uart. This fixes a crash if there is a mistake in the DTS.
Signed-off-by: Yuriy Kozlov <ykozlov@ptcusa.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/altera_uart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c index 50bc5a5..37db1d5 100644 --- a/drivers/tty/serial/altera_uart.c +++ b/drivers/tty/serial/altera_uart.c @@ -555,7 +555,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; @@ -563,7 +563,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 */ |