diff --git a/[refs] b/[refs]
index 48f1827012fc..1f074d338275 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfea00191aec19dc1115934a3c06e97fd8338e2e
+refs/heads/master: b1e1179cea0e50ae3fead8c6bd064a985dae8f8b
diff --git a/trunk/drivers/media/video/mt9m032.c b/trunk/drivers/media/video/mt9m032.c
index 7636672c3548..645973c5feb0 100644
--- a/trunk/drivers/media/video/mt9m032.c
+++ b/trunk/drivers/media/video/mt9m032.c
@@ -392,10 +392,11 @@ static int mt9m032_set_pad_format(struct v4l2_subdev *subdev,
 	}
 
 	/* Scaling is not supported, the format is thus fixed. */
-	ret = mt9m032_get_pad_format(subdev, fh, fmt);
+	fmt->format = *__mt9m032_get_pad_format(sensor, fh, fmt->which);
+	ret = 0;
 
 done:
-	mutex_lock(&sensor->lock);
+	mutex_unlock(&sensor->lock);
 	return ret;
 }