---

yaml --- r: 299464 b: refs/heads/master c: cd90491 h: refs/heads/master v: v3
git-mirror · Apr 19, 2012 · b2283af · b2283af
1 parent a563a77
commit b2283af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9b786955f80fb306471fdb9ea24c6d03af6ca36
+refs/heads/master: cd90491bcd63af3f1505de76aa82d5884f1d16e7
diff --git 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;
 }