From 20da0f115cec544df23ade9c67eb5c36e588a97d Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 29 Sep 2011 07:57:00 -0300 Subject: [PATCH] --- yaml --- r: 273723 b: refs/heads/master c: 882cc8539ee73e855a149f99e2166766ce5deb35 h: refs/heads/master i: 273721: c8fd48b4da45c2ef8d753072dcc08140bda75095 273719: 9f1c7a52afb582cc76abc3ff614270fffb0cbe99 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/omap3isp/ispccdc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8daf363ffca1..726c7584281e 100644 --- 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 index 6330b1d57b1e..b0b0fa5a3572 100644 --- 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;