---

yaml --- r: 358272 b: refs/heads/master c: 3969f05 h: refs/heads/master v: v3
git-mirror · Feb 20, 2013 · 24a3b2b · 24a3b2b
1 parent ac67c13
commit 24a3b2b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b795016cd2c6aebfa40cbccb3bad4e0325815fb4
+refs/heads/master: 3969f05bb8d0d72ba974ab5f74a7bafb61dd16d0
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/base.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
@@ -299,6 +299,7 @@ nouveau_therm_create_(struct nouveau_object *parent,
 
 	nouveau_alarm_init(&priv->alarm, nouveau_therm_alarm);
 	spin_lock_init(&priv->lock);
+	spin_lock_init(&priv->sensor.alarm_program_lock);
 
 	priv->base.fan_get = nouveau_therm_fan_user_get;
 	priv->base.fan_set = nouveau_therm_fan_user_set;

diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c
@@ -279,7 +279,6 @@ nv50_therm_ctor(struct nouveau_object *parent,
 	priv->base.base.pwm_clock = nv50_fan_pwm_clock;
 	priv->base.base.temp_get = nv50_temp_get;
 	priv->base.sensor.program_alarms = nv50_therm_program_alarms;
-	spin_lock_init(&priv->base.sensor.alarm_program_lock);
 	nv_subdev(priv)->intr = nv50_therm_intr;
 
 	/* init the thresholds */