summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorRobert Baldyga <r.baldyga@samsung.com>2014-11-24 07:56:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-25 17:06:40 -0800
commit2f1ba72d23a2fa0cdcb4f034a059ce97e6a17696 (patch)
tree348449782bb1402269c236ac339f577ba5b62f92 /drivers/tty
parentef4aca704836920fe16f50e4d859e22162f6e8f7 (diff)
downloadop-kernel-dev-2f1ba72d23a2fa0cdcb4f034a059ce97e6a17696.zip
op-kernel-dev-2f1ba72d23a2fa0cdcb4f034a059ce97e6a17696.tar.gz
serial: samsung: prefer to use fifosize from driver data
If we have fifosize set in driver data we prefer to use it instead of default fifosize value (which is always 16). If there is defined fifosize for particular serial we prefer to use it, otherwise we use value from info, which is common for all serials on given platform. Signed-off-by: Robert Baldyga <r.baldyga@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/samsung.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 33a953e..34db167 100644
--- 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++;
OpenPOWER on IntegriCloud