diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-05 20:06:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-05 20:06:43 +0000 |
| commit | 47cf66ff098ac408194713be6531a7bb57d1b99b (patch) | |
| tree | 6711205bc3d5f6200adea4ba2173f2d1d9b0c063 /drivers/tty | |
| parent | 66cadb7bd46c6691eea6f671380405ab03b423ad (diff) | |
| parent | 7c9373fbcd0b29f6ccc28407c11ecd51cfa7a3c2 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/vt8500_serial.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c index 1a8bc2275ea..f72b43fbbef 100644 --- a/drivers/tty/serial/vt8500_serial.c +++ b/drivers/tty/serial/vt8500_serial.c @@ -559,12 +559,13 @@ static int vt8500_serial_probe(struct platform_device *pdev) if (!mmres || !irqres) return -ENODEV; - if (np) + if (np) { port = of_alias_get_id(np, "serial"); if (port >= VT8500_MAX_PORTS) port = -1; - else + } else { port = -1; + } if (port < 0) { /* calculate the port id */ |