From 018af4f9482b28b02e4a6fd6401207cd10d7fe1f Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Sun, 3 Feb 2013 19:12:49 +0100
Subject: [PATCH] --- yaml --- r: 358275 b: refs/heads/master c:
 d0a5191dcf5f37cf0942c4b65fa4a2c975631c0b h: refs/heads/master i:   358273:
 7d73239a941d067ba74d8a317d6336fd0fa23962   358271:
 ac67c131acc7aab0c6d5108b86a558be42cf7d50 v: v3

---
 [refs]                                               |  2 +-
 .../drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d5fbeda5b8c9..4824084eacf8 100644
--- 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
index accc628948c4..0f5363edb964 100644
--- 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,
 	},
 };