---

yaml --- r: 358275 b: refs/heads/master c: d0a5191 h: refs/heads/master i: 358273: 7d73239 358271: ac67c13 v: v3
git-mirror · Feb 20, 2013 · 018af4f · 018af4f
1 parent 0f11657
commit 018af4f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 134fc0327552f3ebee2cdcb50b956a31029661c0
+refs/heads/master: d0a5191dcf5f37cf0942c4b65fa4a2c975631c0b
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c
@@ -173,13 +173,23 @@ nv40_therm_ctor(struct nouveau_object *parent,
 	return nouveau_therm_preinit(&priv->base.base);
 }
 
+static int
+nv40_therm_init(struct nouveau_object *object)
+{
+	struct nouveau_therm *therm = (void *)object;
+
+	nv40_sensor_setup(therm);
+
+	return _nouveau_therm_init(object);
+}
+
 struct nouveau_oclass
 nv40_therm_oclass = {
 	.handle = NV_SUBDEV(THERM, 0x40),
 	.ofuncs = &(struct nouveau_ofuncs) {
 		.ctor = nv40_therm_ctor,
 		.dtor = _nouveau_therm_dtor,
-		.init = _nouveau_therm_init,
+		.init = nv40_therm_init,
 		.fini = _nouveau_therm_fini,
 	},
 };