From 38b4b9fc3c18748bbf0b45c00a1345a74450bedd Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 5 Nov 2009 13:56:50 +0900 Subject: [PATCH] --- yaml --- r: 173478 b: refs/heads/master c: 8820002c18cd3167d2800c002f13d78fa0325402 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/perf_event.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fef1a17d1424..849cb8fb05d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6d0137d6156db54a9e6ff74458ed4342a45abb5 +refs/heads/master: 8820002c18cd3167d2800c002f13d78fa0325402 diff --git a/trunk/arch/sh/kernel/perf_event.c b/trunk/arch/sh/kernel/perf_event.c index 4449f0ac9bf8..7ff0943e7a08 100644 --- a/trunk/arch/sh/kernel/perf_event.c +++ b/trunk/arch/sh/kernel/perf_event.c @@ -103,7 +103,7 @@ static int __hw_perf_event_init(struct perf_event *event) { struct perf_event_attr *attr = &event->attr; struct hw_perf_event *hwc = &event->hw; - int config; + int config = -1; int err; if (!sh_pmu_initialized()) @@ -155,8 +155,6 @@ static int __hw_perf_event_init(struct perf_event *event) config = sh_pmu->event_map(attr->config); break; - default: - return -EINVAL; } if (config == -1)