projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 2f99efb4 PS |
1 | Signed-off-by: Colin Leroy <colin@colino.net> |
| 2 | Signed-off-by: Michael Hunold <hunold@linuxtv.org> | |
| 3 | ||
| 4 | --- a/drivers/media/common/saa7146_video.c 2004-07-12 10:15:51.833352344 +0200 | |
| 5 | +++ b/drivers/media/common/saa7146_video.c 2004-07-12 10:16:21.209886432 +0200 | |
| 182e9e55 PS |
6 | @@ -1,9 +1,9 @@ |
| 7 | #include <media/saa7146_vv.h> | |
| 8 | ||
| 9 | -static int memory = 32; | |
| 2f99efb4 | 10 | +static int max_memory = 32; |
| 182e9e55 PS |
11 | |
| 12 | -MODULE_PARM(memory,"i"); | |
| 13 | -MODULE_PARM_DESC(memory, "maximum memory usage for capture buffers (default: 32Mb)"); | |
| 2f99efb4 PS |
14 | +MODULE_PARM(max_memory,"i"); |
| 15 | +MODULE_PARM_DESC(max_memory, "maximum memory usage for capture buffers (default: 32Mb)"); | |
| 182e9e55 PS |
16 | |
| 17 | #define IS_CAPTURE_ACTIVE(fh) \ | |
| 18 | (((vv->video_status & STATUS_CAPTURE) != 0) && (vv->video_fh == fh)) | |
| 19 | @@ -1331,9 +1331,9 @@ | |
| 20 | ||
| 21 | *size = fh->video_fmt.sizeimage; | |
| 22 | ||
| 23 | - /* check if we exceed the "memory" parameter */ | |
| 24 | - if( (*count * *size) > (memory*1048576) ) { | |
| 25 | - *count = (memory*1048576) / *size; | |
| 2f99efb4 PS |
26 | + /* check if we exceed the "max_memory" parameter */ |
| 27 | + if( (*count * *size) > (max_memory*1048576) ) { | |
| 28 | + *count = (max_memory*1048576) / *size; | |
| 182e9e55 PS |
29 | } |
| 30 | ||
| 31 | DEB_CAP(("%d buffers, %d bytes each.\n",*count,*size)); |