summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-09-29 12:57:00 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 21:33:47 +0100
commit882cc8539ee73e855a149f99e2166766ce5deb35 (patch)
tree20041021373696a94c0d4cda41a3196f1efcaa2a /drivers/media
parent[media] omap3isp: Fix memory leaks in initialization error paths (diff)
downloadlinux-882cc8539ee73e855a149f99e2166766ce5deb35.tar.xz
linux-882cc8539ee73e855a149f99e2166766ce5deb35.zip
[media] omap3isp: ccdc: remove redundant operation
Trivial arithmetics clean up. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/omap3isp/ispccdc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
index 6330b1d57b1e..b0b0fa5a3572 100644
--- a/drivers/media/video/omap3isp/ispccdc.c
+++ b/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;