From: Chen Gang <gang.chen@asianux.com>
Date: Thu, 28 Feb 2013 16:51:29 +0000 (+0100)
Subject: ARM: 7664/1: perf: remove erroneous semicolon from event initialisation
X-Git-Tag: v3.9-rc2~17^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e595ede6050b1ce982d74f7084f93715bcc32359;p=~emulex%2Finfiniband.git

ARM: 7664/1: perf: remove erroneous semicolon from event initialisation

Commit 9dcbf466559f ("ARM: perf: simplify __hw_perf_event_init err
handling") tidied up the error handling code for perf event
initialisation on ARM, but a copy-and-paste error left a dangling
semicolon at the end of an if statement.

This patch removes the broken semicolon, restoring the old group
validation semantics.

Cc: Mark Rutland <mark.rutland@arm.com>
Acked-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index 31e0eb353cd..a89206799db 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -400,7 +400,7 @@ __hw_perf_event_init(struct perf_event *event)
 	}
 
 	if (event->group_leader != event) {
-		if (validate_group(event) != 0);
+		if (validate_group(event) != 0)
 			return -EINVAL;
 	}