diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-03 10:32:47 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-03 10:32:47 -0700 |
| commit | 43231b5be657fde1c4ced180d829bbd59ceef9ad (patch) | |
| tree | c20d5c79e63533abf71ab8f89598eb777e9bee2b /arch/arm/mach-omap2/clock.c | |
| parent | 105612489bf59386b46b3f9f034e03f70e57aee6 (diff) | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| download | talos-op-linux-43231b5be657fde1c4ced180d829bbd59ceef9ad.tar.gz talos-op-linux-43231b5be657fde1c4ced180d829bbd59ceef9ad.zip | |
Merge commit '7185684' into omap-for-v3.10/timer
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index e4ec3a69ee2e..2191f25ad21b 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -596,7 +596,7 @@ int __init omap2_clk_switch_mpurate_at_boot(const char *mpurate_ck_name) return -ENOENT; r = clk_set_rate(mpurate_ck, mpurate); - if (IS_ERR_VALUE(r)) { + if (r < 0) { WARN(1, "clock: %s: unable to set MPU rate to %d: %d\n", mpurate_ck_name, mpurate, r); clk_put(mpurate_ck); |
