From 2d51ccdd501e620b3c323f4df3f07a6e5d03ea6d Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Fri, 13 Apr 2007 21:23:49 +0200 Subject: [PATCH] V4L: saa7146: Fix allocation of clipping memory Olaf Hering pointed out that SAA7146_CLIPPING_MEM would become very large for PAGE_SIZE > 4K. In fact, the number of clipping windows is limited to 16, and calculate_clipping_registers_rect() does not use more than 256 bytes. SAA7146_CLIPPING_MEM adjusted accordingly. (cherry picked from commit 7a7cd1920969dd9da4e0d99aab573b3eba24c799) Thanks-to: Olaf Hering Signed-off-by: Oliver Endriss Signed-off-by: Michael Krufky Signed-off-by: Adrian Bunk --- include/media/saa7146_vv.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index e5e749e984ee..36486c80d11f 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -238,7 +238,8 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits); #define SAA7146_HPS_SYNC_PORT_B 0x01 /* some memory sizes */ -#define SAA7146_CLIPPING_MEM (14*PAGE_SIZE) +/* max. 16 clipping rectangles */ +#define SAA7146_CLIPPING_MEM (16 * 4 * sizeof(u32)) /* some defines for the various clipping-modes */ #define SAA7146_CLIPPING_RECT 0x4 -- 2.39.5