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

… no pwm connected Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
git-mirror · Nov 8, 2013 · 21b1ed1 · 21b1ed1
1 parent 09b8d73
commit 21b1ed1
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c b/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;