1 --- linux-2.6.7/drivers/media/common/saa7146_video.c.orig 2004-06-16 07:19:37.000000000 +0200
2 +++ linux-2.6.7/drivers/media/common/saa7146_video.c 2004-07-06 23:10:55.768840056 +0200
4 #include <media/saa7146_vv.h>
6 -static int memory = 32;
7 +static int capmemory = 32;
9 -MODULE_PARM(memory,"i");
10 -MODULE_PARM_DESC(memory, "maximum memory usage for capture buffers (default: 32Mb)");
11 +MODULE_PARM(capmemory,"i");
12 +MODULE_PARM_DESC(capmemory, "maximum memory usage for capture buffers (default: 32Mb)");
14 #define IS_CAPTURE_ACTIVE(fh) \
15 (((vv->video_status & STATUS_CAPTURE) != 0) && (vv->video_fh == fh))
18 *size = fh->video_fmt.sizeimage;
20 - /* check if we exceed the "memory" parameter */
21 - if( (*count * *size) > (memory*1048576) ) {
22 - *count = (memory*1048576) / *size;
23 + /* check if we exceed the "capmemory" parameter */
24 + if( (*count * *size) > (capmemory*1048576) ) {
25 + *count = (capmemory*1048576) / *size;
28 DEB_CAP(("%d buffers, %d bytes each.\n",*count,*size));