serial: samsung: prefer to use fifosize from driver data

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / samsung.c

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 33a953e4cf16d2c8cd341bd643b2a0b29dfe164a..34db16715efc90e4cb760b27d198ca9c6e74d3a1 100644 (file)
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1292,11 +1292,10 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)
                of_property_read_u32(np,
                        "samsung,uart-fifosize", &ourport->port.fifosize);
 
-       if (!ourport->port.fifosize) {
-               ourport->port.fifosize = (ourport->info->fifosize) ?
-                       ourport->info->fifosize :
-                       ourport->drv_data->fifosize[index];
-       }
+       if (ourport->drv_data->fifosize[index])
+               ourport->port.fifosize = ourport->drv_data->fifosize[index];
+       else if (ourport->info->fifosize)
+               ourport->port.fifosize = ourport->info->fifosize;
 
        probe_index++;