summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2018-06-27 16:01:05 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2018-06-27 16:01:05 +0100
commit7838306f5ace5183086ad507c58f5988913690e4 (patch)
tree59dda6b18c71ef516084fe19fc686f24cf9d0423 /drivers
parent7daf201d7fe8334e2d2364d4e8ed3394ec9af819 (diff)
parenta45fc268db20ecd859bb61e25045912b3194b5e6 (diff)
Merge branch 'perf/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux
* 'perf/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux: drivers/perf: xgene_pmu: Fix IOB SLOW PMU parser error
Diffstat (limited to 'drivers')
-rw-r--r--drivers/perf/xgene_pmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/perf/xgene_pmu.c b/drivers/perf/xgene_pmu.c
index 6bdb1dad805f..0e31f1392a53 100644
--- a/drivers/perf/xgene_pmu.c
+++ b/drivers/perf/xgene_pmu.c
@@ -1463,7 +1463,7 @@ static char *xgene_pmu_dev_name(struct device *dev, u32 type, int id)
case PMU_TYPE_IOB:
return devm_kasprintf(dev, GFP_KERNEL, "iob%d", id);
case PMU_TYPE_IOB_SLOW:
- return devm_kasprintf(dev, GFP_KERNEL, "iob-slow%d", id);
+ return devm_kasprintf(dev, GFP_KERNEL, "iob_slow%d", id);
case PMU_TYPE_MCB:
return devm_kasprintf(dev, GFP_KERNEL, "mcb%d", id);
case PMU_TYPE_MC: