From 032d30e79f71bed92ac1cfd7f91789a54c775694 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Fri, 27 Aug 2010 14:32:41 +0200 Subject: [PATCH] --- yaml --- r: 211912 b: refs/heads/master c: dc0c22b878a60373762495b8e5628a32c1b80ac4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/oprofile/common.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 967f06037d39..92ff5751b7aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6be4b428197766521aca664a935c63888d096d9 +refs/heads/master: dc0c22b878a60373762495b8e5628a32c1b80ac4 diff --git a/trunk/arch/arm/oprofile/common.c b/trunk/arch/arm/oprofile/common.c index cec9305c1cce..ab875f304f7c 100644 --- a/trunk/arch/arm/oprofile/common.c +++ b/trunk/arch/arm/oprofile/common.c @@ -135,11 +135,10 @@ static int op_perf_start(void) for (event = 0; event < perf_num_counters; ++event) { ret = op_create_counter(cpu, event); if (ret) - goto out; + return ret; } } -out: return ret; } @@ -263,7 +262,7 @@ static int __init init_driverfs(void) ret = platform_driver_register(&oprofile_driver); if (ret) - goto out; + return ret; oprofile_pdev = platform_device_register_simple( oprofile_driver.driver.name, 0, NULL, 0); @@ -272,7 +271,6 @@ static int __init init_driverfs(void) platform_driver_unregister(&oprofile_driver); } -out: return ret; }