diff options
| author | Michael Hunold <devnull@localhost> | 2004-07-28 16:30:12 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2004-07-28 16:30:12 +0000 |
| commit | 13058ef8b0a295a41fc245d3a3d1aaf051f0be83 (patch) | |
| tree | 37126c965f0a080d4b56183f720afa888cc9c0d3 /linux/drivers | |
| parent | 4f70a4e2e8561c18fdbd6aaaeb5d1c131663fb73 (diff) | |
| download | mediapointer-dvb-s2-13058ef8b0a295a41fc245d3a3d1aaf051f0be83.tar.gz mediapointer-dvb-s2-13058ef8b0a295a41fc245d3a3d1aaf051f0be83.tar.bz2 | |
- rename memory to max_memory, because it clashes with some obscure definition of memory on some esoteric platform
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 0e0b7b4d1..daec274e5 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1,9 +1,9 @@ #include <media/saa7146_vv.h> -static int memory = 32; +static int max_memory = 32; -MODULE_PARM(memory,"i"); -MODULE_PARM_DESC(memory, "maximum memory usage for capture buffers (default: 32Mb)"); +MODULE_PARM(max_memory,"i"); +MODULE_PARM_DESC(max_memory, "maximum memory usage for capture buffers (default: 32Mb)"); #define IS_CAPTURE_ACTIVE(fh) \ (((vv->video_status & STATUS_CAPTURE) != 0) && (vv->video_fh == fh)) @@ -1338,9 +1338,9 @@ static int buffer_setup(struct file *file, unsigned int *count, unsigned int *si *size = fh->video_fmt.sizeimage; - /* check if we exceed the "memory" parameter */ - if( (*count * *size) > (memory*1048576) ) { - *count = (memory*1048576) / *size; + /* check if we exceed the "max_memory" parameter */ + if( (*count * *size) > (max_memory*1048576) ) { + *count = (max_memory*1048576) / *size; } DEB_CAP(("%d buffers, %d bytes each.\n",*count,*size)); |