diff --git a/[refs] b/[refs]
index a0fa22a85eb6..0b10bea6e3a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d65fcbb0007bd8f0bcb93d1acd7970eea2aa06fc
+refs/heads/master: cbaa5c54cb73897ed6c2544a60ed52aa3215b0f6
diff --git a/trunk/drivers/media/i2c/soc_camera/mt9m111.c b/trunk/drivers/media/i2c/soc_camera/mt9m111.c
index bbc4ff99603c..0b0ebaa68602 100644
--- a/trunk/drivers/media/i2c/soc_camera/mt9m111.c
+++ b/trunk/drivers/media/i2c/soc_camera/mt9m111.c
@@ -701,11 +701,11 @@ static int mt9m111_set_global_gain(struct mt9m111 *mt9m111, int gain)
 	return reg_write(GLOBAL_GAIN, val);
 }
 
-static int mt9m111_set_autoexposure(struct mt9m111 *mt9m111, int on)
+static int mt9m111_set_autoexposure(struct mt9m111 *mt9m111, int val)
 {
 	struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev);
 
-	if (on)
+	if (val == V4L2_EXPOSURE_AUTO)
 		return reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
 	return reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
 }