diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-16 12:23:00 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-16 12:23:00 -0200 |
| commit | 894e1eb413d3f32d8879e11f4b33cbcc2c5d7e96 (patch) | |
| tree | da66033da007b3cc3d132e32c64288ac177b1815 /linux/drivers/media/video/usbvision/usbvision-video.c | |
| parent | 4b4dfc6cd19377b52fdb73f9ab335736d78ed050 (diff) | |
| parent | 6e8a8dae402c48fec34f461f104dd53f80e8785d (diff) | |
| download | mediapointer-dvb-s2-894e1eb413d3f32d8879e11f4b33cbcc2c5d7e96.tar.gz mediapointer-dvb-s2-894e1eb413d3f32d8879e11f4b33cbcc2c5d7e96.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/dvb-net
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvision/usbvision-video.c')
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-video.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c index 2fb71fbd7..45e4f3b0e 100644 --- a/linux/drivers/media/video/usbvision/usbvision-video.c +++ b/linux/drivers/media/video/usbvision/usbvision-video.c @@ -373,20 +373,15 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file) if(!errCode) { /* Allocate memory for the scratch ring buffer */ errCode = usbvision_scratch_alloc(usbvision); - if(!errCode) { - /* Allocate memory for the USB S buffers */ - errCode = usbvision_sbuf_alloc(usbvision); - if ((!errCode) && (usbvision->isocMode==ISOC_MODE_COMPRESS)) { - /* Allocate intermediate decompression buffers only if needed */ - errCode = usbvision_decompress_alloc(usbvision); - } + if ((!errCode) && (isocMode==ISOC_MODE_COMPRESS)) { + /* Allocate intermediate decompression buffers only if needed */ + errCode = usbvision_decompress_alloc(usbvision); } } if (errCode) { /* Deallocate all buffers if trouble */ usbvision_frames_free(usbvision); usbvision_scratch_free(usbvision); - usbvision_sbuf_free(usbvision); usbvision_decompress_free(usbvision); } } @@ -466,9 +461,8 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file) usbvision_stop_isoc(usbvision); usbvision_decompress_free(usbvision); - usbvision_rvfree(usbvision->fbuf, usbvision->fbuf_size); + usbvision_frames_free(usbvision); usbvision_scratch_free(usbvision); - usbvision_sbuf_free(usbvision); usbvision->user--; |