Merge drm/drm-next into drm-intel-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_driver.c

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 31d4847eb21ccb04ef9112755112a19c7af24f43..522733a8994634a2e7c598fc3adaa5ff9a44de97 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -469,7 +469,9 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
        if (ret)
                return ret;
 
-       i915_perf_init(dev_priv);
+       ret = i915_perf_init(dev_priv);
+       if (ret)
+               return ret;
 
        ret = i915_ggtt_probe_hw(dev_priv);
        if (ret)