From 4529d5be7ebe1d20d23907e854c2b9c172c4ceaa Mon Sep 17 00:00:00 2001 From: Stephen Neuendorffer Date: Thu, 3 Apr 2008 03:52:13 +1100 Subject: [PATCH] --- yaml --- r: 91500 b: refs/heads/master c: 19a74263f49dce2b96e2213f7f4c029cedbbf0ce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/of_serial.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d9f39db4bc7..3d4ff97c6d21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f91925c89c39e77c170de9366ffa5144a8dd8ec +refs/heads/master: 19a74263f49dce2b96e2213f7f4c029cedbbf0ce diff --git a/trunk/drivers/serial/of_serial.c b/trunk/drivers/serial/of_serial.c index c0e50a461055..8aacfb78deab 100644 --- a/trunk/drivers/serial/of_serial.c +++ b/trunk/drivers/serial/of_serial.c @@ -56,7 +56,9 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev, port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP | UPF_FIXED_PORT; port->dev = &ofdev->dev; - port->custom_divisor = *clk / (16 * (*spd)); + /* If current-speed was set, then try not to change it. */ + if (spd) + port->custom_divisor = *clk / (16 * (*spd)); return 0; }