diff options
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/zoran_driver.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c index 37e25c25279b..06446311564a 100644 --- a/drivers/media/video/zoran_driver.c +++ b/drivers/media/video/zoran_driver.c | |||
| @@ -2737,7 +2737,8 @@ zoran_do_ioctl (struct inode *inode, | |||
| 2737 | fmt->fmt.pix.height = | 2737 | fmt->fmt.pix.height = |
| 2738 | fh->v4l_settings.height; | 2738 | fh->v4l_settings.height; |
| 2739 | fmt->fmt.pix.sizeimage = | 2739 | fmt->fmt.pix.sizeimage = |
| 2740 | fh->v4l_buffers.buffer_size; | 2740 | fh->v4l_settings.bytesperline * |
| 2741 | fh->v4l_settings.height; | ||
| 2741 | fmt->fmt.pix.pixelformat = | 2742 | fmt->fmt.pix.pixelformat = |
| 2742 | fh->v4l_settings.format->fourcc; | 2743 | fh->v4l_settings.format->fourcc; |
| 2743 | fmt->fmt.pix.colorspace = | 2744 | fmt->fmt.pix.colorspace = |
| @@ -2984,8 +2985,9 @@ zoran_do_ioctl (struct inode *inode, | |||
| 2984 | 2985 | ||
| 2985 | /* tell the user the | 2986 | /* tell the user the |
| 2986 | * results/missing stuff */ | 2987 | * results/missing stuff */ |
| 2987 | fmt->fmt.pix.sizeimage = fh->v4l_buffers.buffer_size /*zr->gbpl * zr->gheight */ | 2988 | fmt->fmt.pix.sizeimage = |
| 2988 | ; | 2989 | fh->v4l_settings.height * |
| 2990 | fh->v4l_settings.bytesperline; | ||
| 2989 | if (BUZ_MAX_HEIGHT < | 2991 | if (BUZ_MAX_HEIGHT < |
| 2990 | (fh->v4l_settings.height * 2)) | 2992 | (fh->v4l_settings.height * 2)) |
| 2991 | fmt->fmt.pix.field = | 2993 | fmt->fmt.pix.field = |