diff --git a/[refs] b/[refs]
index 355bbfdc2ee4..0dbd69dd2196 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3faa1ffb4f4be7d10715f4b003ff7b27d14eae26
+refs/heads/master: 90205c6cbb8fd9880bf798903a99f5b8903455e2
diff --git a/trunk/drivers/hwmon/smsc47b397.c b/trunk/drivers/hwmon/smsc47b397.c
index 3b65b0e61c49..45266b30ce1d 100644
--- a/trunk/drivers/hwmon/smsc47b397.c
+++ b/trunk/drivers/hwmon/smsc47b397.c
@@ -174,6 +174,8 @@ static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, show_temp, NULL, 3);
    REG: count of 90kHz pulses / revolution */
 static int fan_from_reg(u16 reg)
 {
+	if (reg == 0 || reg == 0xffff)
+		return 0;
 	return 90000 * 60 / reg;
 }