diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
| commit | aaadff81195056c7c14e0d834b3318c624c0fd78 (patch) | |
| tree | 34d66d8dcb25fa9ffb568f8acfdb317ddf203b44 /drivers/media/video | |
| parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) | |
| parent | df7addbb45874f0f992266003155de5a22e1872f (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index e8a1c2247567..ec11619f8ea9 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
| @@ -126,7 +126,7 @@ u32 em28xx_request_buffers(struct em28xx *dev, u32 count) | |||
| 126 | const size_t imagesize = PAGE_ALIGN(dev->frame_size); /*needs to be page aligned cause the buffers can be mapped individually! */ | 126 | const size_t imagesize = PAGE_ALIGN(dev->frame_size); /*needs to be page aligned cause the buffers can be mapped individually! */ |
| 127 | void *buff = NULL; | 127 | void *buff = NULL; |
| 128 | u32 i; | 128 | u32 i; |
| 129 | em28xx_coredbg("requested %i buffers with size %i", count, imagesize); | 129 | em28xx_coredbg("requested %i buffers with size %zd", count, imagesize); |
| 130 | if (count > EM28XX_NUM_FRAMES) | 130 | if (count > EM28XX_NUM_FRAMES) |
| 131 | count = EM28XX_NUM_FRAMES; | 131 | count = EM28XX_NUM_FRAMES; |
| 132 | 132 | ||