diff --git a/CHANGES b/CHANGES
index a4c6a780..6fd687c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -42,7 +42,8 @@ ask CVS about it:
   Module lm87: Fix in0, in1 (2.5V and Vccp1) calculations
   Module mtp008: Fix temp initializations;
                  Save BIOS pin configuration of temps and fans;
-                 Fix sensor type reads/writes		
+                 Fix sensor type reads/writes and fan min writes;
+                 Fix spurious invalid sensor type messages
   Module sensors: Disabled, moved to i2c package as i2c-proc.c
   Module sis5595: Fix temp, add in4 for chip revision 0xc0;
                   Allow force_addr=0xaddr
diff --git a/kernel/chips/mtp008.c b/kernel/chips/mtp008.c
index bb6d4c71..b3aeda74 100644
--- a/kernel/chips/mtp008.c
+++ b/kernel/chips/mtp008.c
@@ -853,7 +853,7 @@ void mtp008_fan(struct i2c_client *client, int operation, int ctl_name,
 			data->fan_min[nr] =
 			    FAN_TO_REG(results[0],
 				       DIV_FROM_REG(data->fan_div[nr]));
-			mtp008_write_value(client, MTP008_REG_FAN_MIN(nr),
+			mtp008_write_value(client, MTP008_REG_FAN_MIN(nr + 1),
 					   data->fan_min[nr]);
 		}
 	}
@@ -1124,13 +1124,13 @@ void mtp008_sens(struct i2c_client *client, int operation, int ctl_name,
 						client, MTP008_REG_PIN_CTRL2,
 						tmp & ~MTP008_CFG_VT1_PII);
 					data->sens[0] = 2;
-					break;
+					return;
 				case PIIDIODE:
 					mtp008_write_value(
 						client, MTP008_REG_PIN_CTRL2,
 						tmp | MTP008_CFG_VT1_PII);
 					data->sens[0] = 3;
-					break;
+					return;
 				}
 
 				break;
@@ -1144,19 +1144,19 @@ void mtp008_sens(struct i2c_client *client, int operation, int ctl_name,
 						client, MTP008_REG_PIN_CTRL2,
 						tmp | MTP008_CFG_VT2_AIN);
 					data->sens[1] = 1;
-					break;
+					return;
 				case THERMISTOR:
 					mtp008_write_value(
 						client, MTP008_REG_PIN_CTRL2,
 						tmp | MTP008_CFG_VT2_VT);
 					data->sens[1] = 2;
-					break;
+					return;
 				case PIIDIODE:
 					mtp008_write_value(
 						client, MTP008_REG_PIN_CTRL2,
 						tmp | MTP008_CFG_VT2_PII);
 					data->sens[1] = 3;
-					break;
+					return;
 				}
 
 				break;
@@ -1169,13 +1169,13 @@ void mtp008_sens(struct i2c_client *client, int operation, int ctl_name,
 						client, MTP008_REG_PIN_CTRL2,
 						tmp & ~MTP008_CFG_VT3_VT);
 					data->sens[2] = 1;
-					break;
+					return;
 				case THERMISTOR:
 					mtp008_write_value(
 						client, MTP008_REG_PIN_CTRL2,
 						tmp | MTP008_CFG_VT3_VT);
 					data->sens[2] = 2;
-					break;
+					return;
 				}
 
 				break;