---

yaml --- r: 345211 b: refs/heads/master c: 263b30d h: refs/heads/master i: 345209: e0f98f7 345207: e78b214 v: v3
git-mirror · Nov 11, 2012 · cbdb84e · cbdb84e
1 parent 2a5ea3d
commit cbdb84e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14f86147a90cb47db7ccfd90bf14f830fb34fba9
+refs/heads/master: 263b30d4b1a52432075069070328cfa641179f92
diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c
@@ -3842,7 +3842,7 @@ void intel_init_power_wells(struct drm_device *dev)
 
 		if ((well & HSW_PWR_WELL_STATE) == 0) {
 			I915_WRITE(power_wells[i], well & HSW_PWR_WELL_ENABLE);
-			if (wait_for(I915_READ(power_wells[i] & HSW_PWR_WELL_STATE), 20))
+			if (wait_for((I915_READ(power_wells[i]) & HSW_PWR_WELL_STATE), 20))
 				DRM_ERROR("Error enabling power well %lx\n", power_wells[i]);
 		}
 	}