From 66ed94af8878b862001f857652558b48ad92bd44 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <guenter.roeck@ericsson.com>
Date: Thu, 8 Dec 2011 10:55:16 -0800
Subject: [PATCH] --- yaml --- r: 280579 b: refs/heads/master c:
 5cd3222a9f3742e3da6becbd1a939e1221e030c4 h: refs/heads/master i:   280577:
 93b25d2eb861615a7487c951afba1363548956fb   280575:
 cd71a68d22357df1cd89122de4b852a9f825e274 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/hwmon/f75375s.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ee868566784f..12f0ada9a9f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1b561a228de9796eff8c7e03e1e7ee63ab13115
+refs/heads/master: 5cd3222a9f3742e3da6becbd1a939e1221e030c4
diff --git a/trunk/drivers/hwmon/f75375s.c b/trunk/drivers/hwmon/f75375s.c
index 9c3f078e263b..35b570e56ff0 100644
--- a/trunk/drivers/hwmon/f75375s.c
+++ b/trunk/drivers/hwmon/f75375s.c
@@ -372,6 +372,10 @@ static ssize_t set_pwm_mode(struct device *dev, struct device_attribute *attr,
 	if (!(val == 0 || val == 1))
 		return -EINVAL;
 
+	/* F75373 does not support DC (linear voltage) fan control mode */
+	if (data->kind == f75373 && val == 0)
+		return -EINVAL;
+
 	mutex_lock(&data->update_lock);
 	conf = f75375_read8(client, F75375_REG_CONFIG1);
 	conf &= ~(1 << FAN_CTRL_LINEAR(nr));