---

yaml --- r: 299117 b: refs/heads/master c: acede70 h: refs/heads/master i: 299115: 8cecf73 v: v3
git-mirror · Apr 9, 2012 · f1fb35f · f1fb35f
1 parent a0d27d0
commit f1fb35f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -556,15 +556,15 @@ 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;
 
 	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 */