git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
serial: 8250_pci: Add MKS Tenta SCOM-0800 and SCOM-0801 cards
[pandora-kernel.git]
/
drivers
/
tty
/
serial
/
altera_uart.c
diff --git
a/drivers/tty/serial/altera_uart.c
b/drivers/tty/serial/altera_uart.c
index
1d04c50
..
5ba0898
100644
(file)
--- 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;
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;
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;
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 */
port->irq = platp->irq;
/* Check platform data first so we can override device node data */