From c879af0db7260a24637ba5074c067927d29fceb8 Mon Sep 17 00:00:00 2001 From: Kyoungil Kim Date: Sun, 20 May 2012 17:49:31 +0900 Subject: [PATCH] --- yaml --- r: 325561 b: refs/heads/master c: 25f04ad423e5eb40c33a904db5a0d2c7e3bf08f5 h: refs/heads/master i: 325559: 7d4d0174f37d90a0c10d039868d5e76c30de10f4 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/samsung.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 38fc14af93e8..34917cd1b06e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7cd88831feb03cadb355d5fb2b18ebe284c1f1e3 +refs/heads/master: 25f04ad423e5eb40c33a904db5a0d2c7e3bf08f5 diff --git a/trunk/drivers/tty/serial/samsung.c b/trunk/drivers/tty/serial/samsung.c index 56685387f8eb..cefdd2d7c58c 100644 --- a/trunk/drivers/tty/serial/samsung.c +++ b/trunk/drivers/tty/serial/samsung.c @@ -1013,10 +1013,10 @@ static int s3c24xx_serial_cpufreq_transition(struct notifier_block *nb, * a disturbance in the clock-rate over the change. */ - if (IS_ERR(port->clk)) + if (IS_ERR(port->baudclk)) goto exit; - if (port->baudclk_rate == clk_get_rate(port->clk)) + if (port->baudclk_rate == clk_get_rate(port->baudclk)) goto exit; if (val == CPUFREQ_PRECHANGE) {