From 8e1cf13125b21a6a350feb9c415a497414fa5ea8 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Fri, 21 Sep 2012 14:12:31 +0800 Subject: [PATCH] --- yaml --- r: 339581 b: refs/heads/master c: 5a6a86121f55681b5ae7891d19a462883635beef h: refs/heads/master i: 339579: cbf1a933e0d00986d1edae47d422b8fe94b98897 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/devices-tnetv107x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 685635fd708a..802e708e8ba3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09aaf994e37c3e37fd2b0e9b1856038e31ae3b68 +refs/heads/master: 5a6a86121f55681b5ae7891d19a462883635beef diff --git a/trunk/arch/arm/mach-davinci/devices-tnetv107x.c b/trunk/arch/arm/mach-davinci/devices-tnetv107x.c index 29b17f7d3a5f..773ab07a71a0 100644 --- a/trunk/arch/arm/mach-davinci/devices-tnetv107x.c +++ b/trunk/arch/arm/mach-davinci/devices-tnetv107x.c @@ -374,7 +374,7 @@ void __init tnetv107x_devices_init(struct tnetv107x_device_info *info) * complete sample conversion in time. */ tsc_clk = clk_get(NULL, "sys_tsc_clk"); - if (tsc_clk) { + if (!IS_ERR(tsc_clk)) { error = clk_set_rate(tsc_clk, 5000000); WARN_ON(error < 0); clk_put(tsc_clk);