Browse Source

drm/nouveau/therm: no toggle fan control either if we can't guarantee no pwm connected

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Ben Skeggs 11 years ago
parent
commit
21b1ed10df
1 changed files with 7 additions and 0 deletions
  1. 7 0
      drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c

+ 7 - 0
drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c

@@ -97,6 +97,13 @@ nouveau_fantog_create(struct nouveau_therm *therm, struct dcb_gpio_func *func)
 {
 	struct nouveau_therm_priv *tpriv = (void *)therm;
 	struct nouveau_fantog_priv *priv;
+	int ret;
+
+	if (therm->pwm_ctrl) {
+		ret = therm->pwm_ctrl(therm, func->line, false);
+		if (ret)
+			return ret;
+	}
 
 	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
 	tpriv->fan = &priv->base;