---

yaml --- r: 360907 b: refs/heads/master c: f6853fa h: refs/heads/master i: 360905: 77722a4 360903: fcf1844 v: v3
git-mirror · Mar 4, 2013 · 2c5f3a2 · 2c5f3a2
1 parent 2f910ec
commit 2c5f3a2
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: 650e1203c11354ba84d69ba445abc0efcfe3890a
+refs/heads/master: f6853faa85793bf23b46787e4039824d275453c2
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/init.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
@@ -869,7 +869,7 @@ init_idx_addr_latched(struct nvbios_init *init)
 		init->offset += 2;
 
 		init_wr32(init, dreg, idata);
-		init_mask(init, creg, ~mask, data | idata);
+		init_mask(init, creg, ~mask, data | iaddr);
 	}
 }