From 24a3b2b2d932bec7934795bef168cb344cef13f7 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Wed, 30 Jan 2013 22:21:31 +0100 Subject: [PATCH] --- yaml --- r: 358272 b: refs/heads/master c: 3969f05bb8d0d72ba974ab5f74a7bafb61dd16d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/therm/base.c | 1 + trunk/drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9a4735d5757c..54cd415f1ac1 100644 --- 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 index 25b7f6a907c8..f794dc89a3b2 100644 --- 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 index 4b7fe24f5506..86632cbd65ce 100644 --- 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 */