drm/i915/pmu: Fix uninitialized variable on error path
diff mbox series

Message ID 20191018090514.1818-1-tvrtko.ursulin@linux.intel.com
State New
Headers show
Series
  • drm/i915/pmu: Fix uninitialized variable on error path
Related show

Commit Message

Tvrtko Ursulin Oct. 18, 2019, 9:05 a.m. UTC
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

If name allocation failed the log message will contain an unitialized
error code which can be confusing.

Fixes: 05488673a4d4 ("drm/i915/pmu: Support multiple GPUs")
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/i915_pmu.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Chris Wilson Oct. 18, 2019, 9:58 a.m. UTC | #1
Quoting Tvrtko Ursulin (2019-10-18 10:05:14)
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> If name allocation failed the log message will contain an unitialized
> error code which can be confusing.
> 
> Fixes: 05488673a4d4 ("drm/i915/pmu: Support multiple GPUs")
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Fair enough, that's more of my fail,
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 00fe401868c4..144c32eed045 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -1094,7 +1094,7 @@  static bool is_igp(struct drm_i915_private *i915)
 void i915_pmu_register(struct drm_i915_private *i915)
 {
 	struct i915_pmu *pmu = &i915->pmu;
-	int ret;
+	int ret = -ENOMEM;
 
 	if (INTEL_GEN(i915) <= 2) {
 		dev_info(i915->drm.dev, "PMU not supported for this GPU.");
@@ -1102,10 +1102,8 @@  void i915_pmu_register(struct drm_i915_private *i915)
 	}
 
 	i915_pmu_events_attr_group.attrs = create_event_attributes(pmu);
-	if (!i915_pmu_events_attr_group.attrs) {
-		ret = -ENOMEM;
+	if (!i915_pmu_events_attr_group.attrs)
 		goto err;
-	}
 
 	pmu->base.attr_groups	= i915_pmu_attr_groups;
 	pmu->base.task_ctx_nr	= perf_invalid_context;