From f1fb35fbba2ffe3614969400ce476b3f92dc2c54 Mon Sep 17 00:00:00 2001 From: Yuriy Kozlov Date: Thu, 29 Mar 2012 09:55:27 +0200 Subject: [PATCH] --- yaml --- r: 299117 b: refs/heads/master c: acede70d6561f2d042d9dbb153d9a3469479c0ed h: refs/heads/master i: 299115: 8cecf731c0e4bb27e73a6fb21d369c272a138fb8 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/altera_uart.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0c822c0401d3..14d8b37516ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef37ea34cac19ef46173b26ee47a102f3b987d1e +refs/heads/master: acede70d6561f2d042d9dbb153d9a3469479c0ed diff --git a/trunk/drivers/tty/serial/altera_uart.c b/trunk/drivers/tty/serial/altera_uart.c index e7903751e058..1f0330915d5a 100644 --- a/trunk/drivers/tty/serial/altera_uart.c +++ b/trunk/drivers/tty/serial/altera_uart.c @@ -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 */