V4L/DVB (4970): Usbvision memory fixes

- fix decompression buffer allocation not done at first driver open
- simplification of USB sbuf allocation (use of usb_buffer_alloc)
- replaced vmalloc by vmalloc_32 (for homogeneity)
- add of saa7111 (i2cAddr=0x48) detection printout in attach_inform

Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index b77e25ea8838..31b133ef0698 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -353,20 +353,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);
                 }
         }
@@ -437,9 +432,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--;