---

yaml --- r: 307121 b: refs/heads/master c: 26883c3 h: refs/heads/master i: 307119: f8b47ad v: v3
git-mirror · Apr 12, 2012 · a7672c4 · a7672c4
1 parent 5a5b23d
commit a7672c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fdcf43192559f53305644d0c1e0f7dda398f091
+refs/heads/master: 26883c31b0799e76edf8f0ea8be48b64e09b2a7d
diff --git a/trunk/drivers/gpu/drm/i915/intel_i2c.c b/trunk/drivers/gpu/drm/i915/intel_i2c.c
@@ -248,9 +248,10 @@ gmbus_xfer_write(struct drm_i915_private *dev_priv, struct i2c_msg *msg,
 	u32 val, loop;
 
 	val = loop = 0;
-	do {
-		val |= *buf++ << (8 * loop);
-	} while (--len && ++loop < 4);
+	while (len && loop < 4) {
+		val |= *buf++ << (8 * loop++);
+		len -= 1;
+	}
 
 	I915_WRITE(GMBUS3 + reg_offset, val);
 	I915_WRITE(GMBUS1 + reg_offset,