Message ID | 20140317131732.GM17305@nuc-i3427.alporthouse.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index a62ff21..c9fcc20 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -317,9 +317,10 @@ static void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore) { struct drm_i915_private *dev_priv = dev->dev_private; unsigned long irqflags; - int pending; + int pending = 0; - pending = del_timer_sync(&dev_priv->uncore.force_wake_timer); + if (dev_priv->uncore.force_wake_timer.function) + pending = del_timer_sync(&dev_priv->uncore.force_wake_timer); /* Hold uncore.lock across reset to prevent any register access * with forcewake not set correctly