From 29c648cae7fce18a819cd58d85b9c034e61fc99b Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 24 Nov 2005 17:08:56 +0000 Subject: [PATCH] --- yaml --- r: 17142 b: refs/heads/master c: 31df1678d7732b94178a6e457ed6666e4431212f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/legacy_serial.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf1fb2330317..c1895516c56b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9177ae4378add0126104e2966aa6150258610d59 +refs/heads/master: 31df1678d7732b94178a6e457ed6666e4431212f diff --git a/trunk/arch/powerpc/kernel/legacy_serial.c b/trunk/arch/powerpc/kernel/legacy_serial.c index 28ad50e424a9..7a685cae81ed 100644 --- a/trunk/arch/powerpc/kernel/legacy_serial.c +++ b/trunk/arch/powerpc/kernel/legacy_serial.c @@ -43,7 +43,10 @@ static int __init add_legacy_port(struct device_node *np, int want_index, /* get clock freq. if present */ clk = (u32 *)get_property(np, "clock-frequency", NULL); - clock = clk ? *clk : BASE_BAUD * 16; + if (clk && *clk) + clock = *clk; + else + clock = BASE_BAUD * 16; /* get default speed if present */ spd = (u32 *)get_property(np, "current-speed", NULL);