---

yaml --- r: 273723 b: refs/heads/master c: 882cc85 h: refs/heads/master i: 273721: c8fd48b 273719: 9f1c7a5 v: v3
git-mirror · Nov 3, 2011 · 20da0f1 · 20da0f1
1 parent 46fa206
commit 20da0f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b6390bd95c65ad4a6c650955fa1e3f18f8a540c
+refs/heads/master: 882cc8539ee73e855a149f99e2166766ce5deb35
diff --git a/trunk/drivers/media/video/omap3isp/ispccdc.c b/trunk/drivers/media/video/omap3isp/ispccdc.c
@@ -1836,7 +1836,7 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
 		 * callers to request an output size bigger than the input size
 		 * up to the nearest multiple of 16.
 		 */
-		fmt->width = clamp_t(u32, width, 32, (fmt->width + 15) & ~15);
+		fmt->width = clamp_t(u32, width, 32, fmt->width + 15);
 		fmt->width &= ~15;
 		fmt->height = clamp_t(u32, height, 32, fmt->height);
 		break;