diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-10-18 17:45:49 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-10-18 17:45:49 +0100 |
| commit | c0f44fddd95cd4e5896048815230a44732f5a379 (patch) | |
| tree | 1f6df1d7a3b508342086ed65ca7e2bc6ce85c37d | |
| parent | 19436b17a4dbbd8a3be89170bf955faeac69f600 (diff) | |
| parent | 6d262acec4f6a8a9fc59a5b6a694c32f6f7a908d (diff) | |
Merge branch 'tracking-armlt-tc2-pm' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20121018.0
| -rw-r--r-- | drivers/misc/arm-cci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/misc/arm-cci.c b/drivers/misc/arm-cci.c index 53845eadaa9a..01993130c4ac 100644 --- a/drivers/misc/arm-cci.c +++ b/drivers/misc/arm-cci.c @@ -181,6 +181,9 @@ static int cci_pmu_map_event(struct perf_event *event) int mapping; u8 config = event->attr.config & CCI400_PMU_EVENT_MASK; + if (event->attr.type < PERF_TYPE_MAX) + return -ENOENT; + /* 0xff is used to represent CCI Cycles */ if (config == 0xff) mapping = config; |