perf/marvell_cn10k: Fix tad_pmu_event_init() to check pmu type first

Make sure to check the pmu type first and then check event->attr.disabled.
Doing so would avoid reading the disabled attribute of an event that is
not handled by TAD PMU.

Signed-off-by: Tanmay Jagdale <tanmay@marvell.com>
Link: https://lore.kernel.org/r/20220510102657.487539-1-tanmay@marvell.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/perf/marvell_cn10k_tad_pmu.c b/drivers/perf/marvell_cn10k_tad_pmu.c
index ee67305f822d08a08e29dcd6a7c69a2dfd82fa1a..282d3a071a67c661de6986d53a31dfd34a0186f2 100644 (file)
--- a/drivers/perf/marvell_cn10k_tad_pmu.c
+++ b/drivers/perf/marvell_cn10k_tad_pmu.c
@@ -146,12 +146,12 @@ static int tad_pmu_event_init(struct perf_event *event)
 {
        struct tad_pmu *tad_pmu = to_tad_pmu(event->pmu);
 
-       if (!event->attr.disabled)
-               return -EINVAL;
-
        if (event->attr.type != event->pmu->type)
                return -ENOENT;
 
+       if (!event->attr.disabled)
+               return -EINVAL;
+
        if (event->state != PERF_EVENT_STATE_OFF)
                return -EINVAL;